From c470a9e0921a8595f00f033f99e58a3d9c1248eb Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Wed, 31 Jul 2024 14:43:25 +0200 Subject: [PATCH] PR checks: Manually exclude Swift from `init` languages on Linux --- .github/workflows/__all-platform-bundle.yml | 2 ++ .github/workflows/__multi-language-autodetect.yml | 13 +++++++++++-- .github/workflows/__scaling-reserved-ram.yml | 12 ++++++++++-- .github/workflows/__test-local-codeql.yml | 1 + .github/workflows/__unset-environment.yml | 2 ++ .github/workflows/debug-artifacts.yml | 2 ++ .github/workflows/test-codeql-bundle-all.yml | 2 ++ pr-checks/checks/all-platform-bundle.yml | 2 ++ pr-checks/checks/multi-language-autodetect.yml | 15 ++++++++++++--- pr-checks/checks/scaling-reserved-ram.yml | 13 +++++++++++-- pr-checks/checks/test-local-codeql.yml | 1 + pr-checks/checks/unset-environment.yml | 2 ++ 12 files changed, 58 insertions(+), 9 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index dea4a41a8a..e91b5757ee 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -60,6 +60,8 @@ jobs: - id: init uses: ./../action/init with: + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Build code shell: bash diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index d2b6baab5a..95ab6fe422 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -92,7 +92,16 @@ jobs: go-version: '>=1.21.0' - uses: ./../action/init - id: init + if: runner.os == 'ubuntu' + with: + db-location: ${{ runner.temp }}/customDbLocation + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby + tools: ${{ steps.prepare-test.outputs.tools-url }} + + - uses: ./../action/init + id: init-macos + if: runner.os == 'macOS' with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} @@ -100,7 +109,7 @@ jobs: - uses: ./../action/.github/actions/setup-swift if: runner.os == 'macOS' with: - codeql-path: ${{ steps.init.outputs.codeql-path }} + codeql-path: ${{ steps.init-macos.outputs.codeql-path }} - name: Build code shell: bash diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index 8ec4693ece..cb824e9931 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -90,9 +90,17 @@ jobs: - uses: actions/setup-go@v5 with: go-version: '>=1.21.0' + - uses: ./../action/init + if: runner.os == 'ubuntu' + with: + db-location: ${{ runner.temp }}/customDbLocation + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby + tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/init - id: init + id: init-macos + if: runner.os == 'macOS' with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} @@ -100,7 +108,7 @@ jobs: - uses: ./../action/.github/actions/setup-swift if: runner.os == 'macOS' with: - codeql-path: ${{ steps.init.outputs.codeql-path }} + codeql-path: ${{ steps.init-macos.outputs.codeql-path }} - name: Build code shell: bash diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index adb275b2d3..482ea72ced 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -66,6 +66,7 @@ jobs: - id: init uses: ./../action/init with: + languages: cpp,csharp,go,java,javascript,python,ruby tools: ./codeql-bundle-linux64.tar.gz - name: Build code shell: bash diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index cb2b625ed7..eb809804f3 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -75,6 +75,8 @@ jobs: id: init with: db-location: ${{ runner.temp }}/customDbLocation + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: actions/setup-go@v5 with: diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 135e6e46fb..3ac61de084 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -52,6 +52,8 @@ jobs: debug: true debug-artifact-name: my-debug-artifacts debug-database-name: my-db + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby - name: Build code shell: bash run: ./build.sh diff --git a/.github/workflows/test-codeql-bundle-all.yml b/.github/workflows/test-codeql-bundle-all.yml index d675839772..2524f58e48 100644 --- a/.github/workflows/test-codeql-bundle-all.yml +++ b/.github/workflows/test-codeql-bundle-all.yml @@ -42,6 +42,8 @@ jobs: - id: init uses: ./../action/init with: + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Build code shell: bash diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml index 2f1a73303c..a0c5233133 100644 --- a/pr-checks/checks/all-platform-bundle.yml +++ b/pr-checks/checks/all-platform-bundle.yml @@ -7,6 +7,8 @@ steps: - id: init uses: ./../action/init with: + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - name: Build code shell: bash diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index 04f7a0cab1..6aaa4b5bf2 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -1,5 +1,5 @@ name: "Multi-language repository" -description: "An end-to-end integration test of a multi-language repository using automatic language detection" +description: "An end-to-end integration test of a multi-language repository using automatic language detection for MacOS" operatingSystems: ["macos", "ubuntu"] steps: - uses: actions/setup-go@v5 @@ -7,7 +7,16 @@ steps: go-version: ">=1.21.0" - uses: ./../action/init - id: init + if: runner.os == 'ubuntu' + with: + db-location: "${{ runner.temp }}/customDbLocation" + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby + tools: ${{ steps.prepare-test.outputs.tools-url }} + + - uses: ./../action/init + id: init-macos + if: runner.os == 'macOS' with: db-location: "${{ runner.temp }}/customDbLocation" tools: ${{ steps.prepare-test.outputs.tools-url }} @@ -15,7 +24,7 @@ steps: - uses: ./../action/.github/actions/setup-swift if: runner.os == 'macOS' with: - codeql-path: ${{ steps.init.outputs.codeql-path }} + codeql-path: ${{ steps.init-macos.outputs.codeql-path }} - name: Build code shell: bash diff --git a/pr-checks/checks/scaling-reserved-ram.yml b/pr-checks/checks/scaling-reserved-ram.yml index 43f22fac85..8a9957ce4b 100644 --- a/pr-checks/checks/scaling-reserved-ram.yml +++ b/pr-checks/checks/scaling-reserved-ram.yml @@ -7,9 +7,18 @@ steps: - uses: actions/setup-go@v5 with: go-version: ">=1.21.0" + + - uses: ./../action/init + if: runner.os == 'ubuntu' + with: + db-location: "${{ runner.temp }}/customDbLocation" + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby + tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/init - id: init + id: init-macos + if: runner.os == 'macOS' with: db-location: "${{ runner.temp }}/customDbLocation" tools: ${{ steps.prepare-test.outputs.tools-url }} @@ -17,7 +26,7 @@ steps: - uses: ./../action/.github/actions/setup-swift if: runner.os == 'macOS' with: - codeql-path: ${{ steps.init.outputs.codeql-path }} + codeql-path: ${{ steps.init-macos.outputs.codeql-path }} - name: Build code shell: bash diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml index ddf01b65ca..ac95a38c8e 100644 --- a/pr-checks/checks/test-local-codeql.yml +++ b/pr-checks/checks/test-local-codeql.yml @@ -12,6 +12,7 @@ steps: - id: init uses: ./../action/init with: + languages: cpp,csharp,go,java,javascript,python,ruby tools: ./codeql-bundle-linux64.tar.gz - name: Build code shell: bash diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml index 1795ed0eae..fe52d02a11 100644 --- a/pr-checks/checks/unset-environment.yml +++ b/pr-checks/checks/unset-environment.yml @@ -7,6 +7,8 @@ steps: id: init with: db-location: ${{ runner.temp }}/customDbLocation + # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu + languages: cpp,csharp,go,java,javascript,python,ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: actions/setup-go@v5 with: