From e9b1cbc263045b08425b96bd8e01c192a2e25160 Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Wed, 2 Mar 2022 13:37:05 -0500 Subject: [PATCH 1/5] Fix CI failures by adding apt-get update to Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 9b5451d3d74..c519e63f289 100644 --- a/Makefile +++ b/Makefile @@ -334,6 +334,7 @@ tsan-%: clean .PHONY: apt-install apt-install: + sudo apt-get update sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install $(APT_PACKAGES) .PHONY: apt-add-repo From 1a6256c37da6be55505a94bc34b5338d9de0ad17 Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Thu, 3 Mar 2022 11:01:37 -0500 Subject: [PATCH 2/5] Fix travis failure caused by apt-get update --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c49f3ee3d6f..f128137fbc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ matrix: - name: ARM Build Test (on Trusty) dist: trusty script: + - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157 3CB3BD13 A15703C6 C17EAB57 - make arminstall - make armbuild From ff7892fcc3346461e248d51038f5ca592f718ea4 Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Thu, 3 Mar 2022 13:05:32 -0500 Subject: [PATCH 3/5] Move apt-get update from Makefile to Github Actions .yml --- .github/workflows/dev-long-tests.yml | 5 +++++ Makefile | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml index 60d1d45b9a7..4bd03ea437f 100644 --- a/.github/workflows/dev-long-tests.yml +++ b/.github/workflows/dev-long-tests.yml @@ -75,6 +75,7 @@ jobs: - uses: actions/checkout@v2 - name: ASan + UBSan + Test Zstd, 32bit mode run: | + sudo apt-get -qqq update make libc6install make -j uasan-test-zstd32 V=1 @@ -88,6 +89,7 @@ jobs: - uses: actions/checkout@v2 - name: gcc-8 + ASan + UBSan + Fuzz Test run: | + sudo apt-get -qqq update make gcc8install CC=gcc-8 FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest @@ -97,6 +99,7 @@ jobs: - uses: actions/checkout@v2 - name: ASan + UBSan + Fuzz Test 32bit run: | + sudo apt-get -qqq update make libc6install CFLAGS="-O3 -m32" FUZZER_FLAGS="--long-tests" make uasan-fuzztest @@ -152,6 +155,8 @@ jobs: - name: valgrind + fuzz test stack mode # ~ 7mn shell: 'script -q -e -c "bash {0}"' run: | + sudo apt-get -qqq update + make arminstall make valgrindinstall make -C tests valgrindTest make clean diff --git a/Makefile b/Makefile index c519e63f289..67ef928cce5 100644 --- a/Makefile +++ b/Makefile @@ -334,7 +334,8 @@ tsan-%: clean .PHONY: apt-install apt-install: - sudo apt-get update + # TODO: uncomment once issue 3011 is resolved and remove hack from Github Actions .yml + # sudo apt-get update sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install $(APT_PACKAGES) .PHONY: apt-add-repo From 3c8e998535bc33bbe88d58d66f8e9f7555a921cd Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Thu, 3 Mar 2022 13:07:08 -0500 Subject: [PATCH 4/5] Revert .travis.yml change --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f128137fbc0..c49f3ee3d6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,6 @@ matrix: - name: ARM Build Test (on Trusty) dist: trusty script: - - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157 3CB3BD13 A15703C6 C17EAB57 - make arminstall - make armbuild From a21958e76018f330b19fd9091203caa0d5de456e Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Thu, 3 Mar 2022 13:14:51 -0500 Subject: [PATCH 5/5] Fix typo --- .github/workflows/dev-long-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml index 4bd03ea437f..779ba1c7c19 100644 --- a/.github/workflows/dev-long-tests.yml +++ b/.github/workflows/dev-long-tests.yml @@ -156,7 +156,6 @@ jobs: shell: 'script -q -e -c "bash {0}"' run: | sudo apt-get -qqq update - make arminstall make valgrindinstall make -C tests valgrindTest make clean