From e7557adde4585104474ffbed77208c0373763afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Wed, 17 Jan 2024 11:47:53 +0000 Subject: [PATCH] Update test-core-linux.yml and tests-ui-linux.yml This commit updates the test-core-linux.yml and tests-ui-linux.yml files. The changes include removing the MAKEFLAGS variable from the pip install command in test-core-linux.yml and moving the "Install BunkerWeb" step after the "Edit configuration files" step in tests-ui-linux.yml. --- .github/workflows/test-core-linux.yml | 2 +- .github/workflows/tests-ui-linux.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml index a8c190d6fb..2bdf045ca9 100644 --- a/.github/workflows/test-core-linux.yml +++ b/.github/workflows/test-core-linux.yml @@ -97,7 +97,7 @@ jobs: run: | export MAKEFLAGS="-j $(nproc)" pip install --no-cache-dir --ignore-installed --require-hashes -r src/deps/requirements-deps.txt - MAKEFLAGS="-j $(nproc)" find tests/core -name "requirements.txt" -exec pip install --no-cache-dir --require-hashes --no-deps -r {} \; + find tests/core -name "requirements.txt" -exec pip install --no-cache-dir --require-hashes --no-deps -r {} \; cd ./tests/core/${{ inputs.TEST }} sudo truncate -s 0 /var/log/bunkerweb/error.log ./test.sh "linux" diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml index 8b59645d40..b8d4826669 100644 --- a/.github/workflows/tests-ui-linux.yml +++ b/.github/workflows/tests-ui-linux.yml @@ -66,8 +66,6 @@ jobs: - name: Fix version without a starting number if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg - - name: Install BunkerWeb - run: sudo apt install -fy /tmp/bunkerweb.deb - name: Edit configuration files run: | # Misc @@ -92,6 +90,8 @@ jobs: sudo chown nginx:nginx /etc/bunkerweb/variables.env /etc/bunkerweb/ui.env sudo chmod 777 /etc/bunkerweb/variables.env /etc/bunkerweb/ui.env + - name: Install BunkerWeb + run: sudo apt install -fy /tmp/bunkerweb.deb - name: Run tests run: | export MAKEFLAGS="-j $(nproc)"