From 7dc3d7d47ee32df1f77622c8b25aa7ba20bd9525 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Mon, 1 Aug 2022 18:15:05 +0200 Subject: [PATCH 1/2] CI: remove unneeded PATH definitions --- .github/workflows/csv-coverage-pr-artifacts.yml | 4 ++-- .github/workflows/csv-coverage-timeseries.yml | 4 +--- .github/workflows/csv-coverage-update.yml | 2 +- .github/workflows/csv-coverage.yml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/csv-coverage-pr-artifacts.yml b/.github/workflows/csv-coverage-pr-artifacts.yml index b63d85534b43..3649b99387bd 100644 --- a/.github/workflows/csv-coverage-pr-artifacts.yml +++ b/.github/workflows/csv-coverage-pr-artifacts.yml @@ -51,14 +51,14 @@ jobs: - name: Generate CSV files on merge commit of the PR run: | echo "Running generator on merge" - PATH="$PATH:codeql-cli/codeql" python merge/misc/scripts/library-coverage/generate-report.py ci merge merge + python merge/misc/scripts/library-coverage/generate-report.py ci merge merge mkdir out_merge cp framework-coverage-*.csv out_merge/ cp framework-coverage-*.rst out_merge/ - name: Generate CSV files on base commit of the PR run: | echo "Running generator on base" - PATH="$PATH:codeql-cli/codeql" python base/misc/scripts/library-coverage/generate-report.py ci base base + python base/misc/scripts/library-coverage/generate-report.py ci base base mkdir out_base cp framework-coverage-*.csv out_base/ cp framework-coverage-*.rst out_base/ diff --git a/.github/workflows/csv-coverage-timeseries.yml b/.github/workflows/csv-coverage-timeseries.yml index 2eb9d0cdf84e..ea216f68949a 100644 --- a/.github/workflows/csv-coverage-timeseries.yml +++ b/.github/workflows/csv-coverage-timeseries.yml @@ -25,9 +25,7 @@ jobs: uses: ./.github/actions/fetch-codeql - name: Build modeled package list run: | - CLI=$(realpath "codeql-cli/codeql") - echo $CLI - PATH="$PATH:$CLI" python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels + python script/misc/scripts/library-coverage/generate-timeseries.py codeqlModels - name: Upload timeseries CSV uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/csv-coverage-update.yml b/.github/workflows/csv-coverage-update.yml index 58e60cc363ed..1de2149ce2eb 100644 --- a/.github/workflows/csv-coverage-update.yml +++ b/.github/workflows/csv-coverage-update.yml @@ -29,7 +29,7 @@ jobs: uses: ./.github/actions/fetch-codeql - name: Generate coverage files run: | - PATH="$PATH:codeql-cli/codeql" python ql/misc/scripts/library-coverage/generate-report.py ci ql ql + python ql/misc/scripts/library-coverage/generate-report.py ci ql ql - name: Create pull request with changes env: diff --git a/.github/workflows/csv-coverage.yml b/.github/workflows/csv-coverage.yml index dfce019451ee..e829957a0d39 100644 --- a/.github/workflows/csv-coverage.yml +++ b/.github/workflows/csv-coverage.yml @@ -29,7 +29,7 @@ jobs: uses: ./.github/actions/fetch-codeql - name: Build modeled package list run: | - PATH="$PATH:codeql-cli/codeql" python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script + python script/misc/scripts/library-coverage/generate-report.py ci codeqlModels script - name: Upload CSV package list uses: actions/upload-artifact@v3 with: From c63afbf7be990ea7ffd0fcf1577f0269ab54450d Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Mon, 1 Aug 2022 18:49:37 +0200 Subject: [PATCH 2/2] CI: remove left-over 'env' commands --- .github/workflows/go-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 6001a18aad16..14114ee2003d 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -30,12 +30,12 @@ jobs: - name: Build run: | cd go - env make + make - name: Check that all QL and Go code is autoformatted run: | cd go - env make check-formatting + make check-formatting - name: Compile qhelp files to markdown run: | @@ -51,7 +51,7 @@ jobs: - name: Test run: | cd go - env make test + make test test-mac: name: Test MacOS