Personal build with diff fails

Answered

Hi,

I am trying to run a personal build using a diff file generated by git. 

We are using 2019.2.2 (build 71923) on docker.

 

I get an error when I click on run: "Error uploading patch file: Patch in file contains no change".

 

Am I doing something wrong or is there an issue?

 

See below the diff file, the build configuration and the error message. Tell me if you need more information!

diff --git a/lib/http_setza.c b/lib/http_setza.c
index 7554d10..b92c7c1 100644
--- a/lib/http_setza.c
+++ b/lib/http_setza.c
@@ -1196,7 +1196,7 @@ int ConnectToHTTPServer(HTTPCli_Handle httpClient, char* hostname_buf, unsigned
sparams.method.secureMethod = SL_SO_SEC_METHOD_TLSV1_2;

//TODO: Use SL_SEC_MASK_SECURE_DEFAULT to allow cipher negotiation between cc3200 and server
- sparams.mask.secureMask = SL_SEC_MASK_TLS_RSA_WITH_AES_128_CBC_SHA256 | SL_SEC_MASK_TLS_RSA_WITH_AES_256_CBC_SHA; // SL_SEC_MASK_SECURE_DEFAULT;
+ sparams.mask.secureMask = SL_SEC_MASK_SECURE_DEFAULT; //SL_SEC_MASK_TLS_RSA_WITH_AES_128_CBC_SHA256 | SL_SEC_MASK_TLS_RSA_WITH_AES_256_CBC_SHA; // SL_SEC_MASK_SECURE_DEFAULT;
strncpy(sparams.cafile, SSL_CA_CERT_FILE_NAME, sizeof(SSL_CA_CERT_FILE_NAME));

Thanks,

Cédric

 

 

5 comments
Comment actions Permalink

Hi Cédric,

 

is this issue still replicating for you? I've tried it myself and it seems to accept it just fine. 

0
Comment actions Permalink

I've just encountered this exact issue with TeamCity Professional 2020.1 (build 78475) on Windows.

I've attempted patch files generated both with and without branch prefixes. I've verified that the patch file does indeed contain the desired changes. There don't seem to be any specific steps for reproduction. It's simply personal build -> upload patch -> run build.

0
Comment actions Permalink

Hi Hinkley,

 

I've been testing this and I can only manage to get the issue if I pass the wrong file or it's in an invalid format. Unfortunately the error message doesn't give enough information (we have a request to improve it here: https://youtrack.jetbrains.com/issue/TW-62621 . You can try to check the log files

 

In the meantime, it's rarely about a set of steps to replicate the error. It might have to do with the setup of your build configuration/VCS Root, besides, of course, issues with the files themselves.

 

If you can replicate this with a repository that is publicly available and post the contents of the patch file we can try to narrow it down in that specific case, but the feature works well otherwise, it has somewhat of a misleading error reporting

0
Comment actions Permalink

Hi !

I just saw your message and retried it. 

Now it's working ok. 

In the interval, we did update the agent from ubuntu 16TLS to 18LTS. The server is still in 2019.2.2. I do not see any other change which could explain it.

 

 

However I still had some manipulation to do with the patch file.

With the file generated by git I got the error: Personal changes patch failed: Couldn't apply unified diff patches: modified file platform.c does not exist

diff --git a/platform.c b/platform.c
index 01a1bf2..e28de93 100644
--- a/platform.c
+++ b/platform.c
@@ -419,7 +419,7 @@ void* displayTask(void* pvParameters)

i2c_configure_temp();

- UART_PRINT("Power ON");
+ UART_PRINT("Power ON test");
ErrorLogUpdate(ERROR_POWER_ON);
FSUpdateLogCounter(CNT_POW);

 

After some trial and error I found it worked when removing the header and adding the subdirectory (This particular build checks out 2 vcs in 2 subdir)

--- build/platform.c
+++ build/platform.c
@@ -419,7 +419,7 @@ void* displayTask(void* pvParameters)

i2c_configure_temp();

- UART_PRINT("Power ON");
+ UART_PRINT("Power ON test");
ErrorLogUpdate(ERROR_POWER_ON);
FSUpdateLogCounter(CNT_POW);

 

 

0
Comment actions Permalink

The logs contain almost the exact same verbiage as the alert does, albeit with a stack trace that doesn't actually add any more context. Thanks for the lead on the OS change Sirde1. I'll certainly look into recent OS updates that may have contributed.

I'll watch the youtrack issue for progress. In the interim, I've simply added my feature branch to the build project's VCS root. I'd prefer not to have development branches in my production build project, but it works well enough for now.

0

Please sign in to leave a comment.