diff --git a/.github/workflows/dbip_download.yml b/.github/workflows/dbip_download.yml index 908254827..e8f947974 100644 --- a/.github/workflows/dbip_download.yml +++ b/.github/workflows/dbip_download.yml @@ -49,7 +49,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git fetch - BRANCH=$(git ls-remote --heads 2>/dev/null | grep generated-source) + BRANCH="$(git ls-remote --exit-code --heads origin generated-source 2>/dev/null || true)" if [[ "$BRANCH" == "" ]] then git checkout -B generated-source @@ -58,7 +58,11 @@ jobs: else git checkout generated-source fi - mv "${TEMP_DIR}"/dbip_country.rs ip_country/src/dbip_country.rs - git add ip_country/src/dbip_country.rs - git commit -m "Update generated dbip_country ${YEAR_MONTH} Rust source file" - git push -u origin HEAD \ No newline at end of file + DIFF="$(diff "${TEMP_DIR}"/dbip_country.rs ip_country/src/dbip_country.rs || true)" + if [[ "$DIFF" != "" ]] + then + mv "${TEMP_DIR}"/dbip_country.rs ip_country/src/dbip_country.rs + git add ip_country/src/dbip_country.rs + git commit -m "Update generated dbip_country ${YEAR_MONTH} Rust source file" || true + git push -u origin HEAD + fi \ No newline at end of file diff --git a/multinode_integration_tests/tests/data_routing_test.rs b/multinode_integration_tests/tests/data_routing_test.rs index 0c4cef279..cdefcd354 100644 --- a/multinode_integration_tests/tests/data_routing_test.rs +++ b/multinode_integration_tests/tests/data_routing_test.rs @@ -316,7 +316,7 @@ fn multiple_stream_zero_hop_test() { let mut another_client = zero_hop_node.make_client(8080, STANDARD_CLIENT_TIMEOUT_MILLIS); one_client.send_chunk(b"GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n"); - another_client.send_chunk(b"GET /online/ HTTP/1.1\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7\r\nAccept-Language: cs-CZ,cs;q=0.9,en;q=0.8,sk;q=0.7\r\nCache-Control: max-age=0\r\nConnection: keep-alive\r\nHost: whatever.neverssl.com\r\nUpgrade-Insecure-Requests: 1\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36\r\n\r\n"); + another_client.send_chunk(b"GET / HTTP/1.1\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7\r\nAccept-Language: cs-CZ,cs;q=0.9,en;q=0.8,sk;q=0.7\r\nCache-Control: max-age=0\r\nConnection: keep-alive\r\nHost: www.testingmcafeesites.com\r\nUpgrade-Insecure-Requests: 1\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36\r\n\r\n"); let one_response = one_client.wait_for_chunk(); let another_response = another_client.wait_for_chunk(); @@ -330,7 +330,8 @@ fn multiple_stream_zero_hop_test() { assert_eq!( index_of( &another_response, - &b"neverssl.com will never use SSL (also known as TLS)"[..], + &b"This is an index url which gives an overview of the different test urls available." + [..], ) .is_some(), true,