diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 990ea6edac..dea4a41a8a 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -61,9 +61,6 @@ jobs: uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash run: ./build.sh diff --git a/.github/workflows/__build-mode-manual.yml b/.github/workflows/__build-mode-manual.yml index 1d309a5f9c..2a93c05a07 100644 --- a/.github/workflows/__build-mode-manual.yml +++ b/.github/workflows/__build-mode-manual.yml @@ -74,10 +74,6 @@ jobs: exit 1 fi - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - - name: Build code shell: bash run: ./build.sh diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 582e896e3c..688f9299e5 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -86,7 +86,7 @@ jobs: run: | cd "$RUNNER_TEMP/results" expected_baseline_languages="c csharp go java kotlin javascript python ruby" - if [[ $RUNNER_OS != "Windows" ]]; then + if [[ $RUNNER_OS == "macOS" ]]; then expected_baseline_languages+=" swift" fi diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 7b917f725c..d2b6baab5a 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -29,14 +29,24 @@ jobs: include: - os: macos-12 version: stable-20230403 + - os: ubuntu-latest + version: stable-20230403 - os: macos-12 version: stable-v2.13.5 + - os: ubuntu-latest + version: stable-v2.13.5 - os: macos-12 version: stable-v2.14.6 + - os: ubuntu-latest + version: stable-v2.14.6 - os: macos-latest version: stable-v2.15.5 + - os: ubuntu-latest + version: stable-v2.15.5 - os: macos-latest version: stable-v2.16.6 + - os: ubuntu-latest + version: stable-v2.16.6 - os: macos-latest version: default - os: ubuntu-latest @@ -88,6 +98,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/.github/actions/setup-swift + if: runner.os == 'macOS' with: codeql-path: ${{ steps.init.outputs.codeql-path }} @@ -139,8 +150,8 @@ jobs: exit 1 fi - - name: Check language autodetect for Swift - if: runner.os != 'Windows' && matrix.version != 'stable-20230403' + - name: Check language autodetect for Swift on MacOS + if: runner.os == 'macOS' shell: bash run: | SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }} diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index f298b17e20..765c336670 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -29,16 +29,10 @@ jobs: include: - os: macos-latest version: linked - - os: ubuntu-latest - version: linked - os: macos-latest version: default - - os: ubuntu-latest - version: default - os: macos-latest version: nightly-latest - - os: ubuntu-latest - version: nightly-latest name: Swift analysis using a custom build command permissions: contents: read diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index b2148455bc..adb275b2d3 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -67,9 +67,6 @@ jobs: uses: ./../action/init with: tools: ./codeql-bundle-linux64.tar.gz - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash run: ./build.sh diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 3f12a3c2b8..cb2b625ed7 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -27,6 +27,16 @@ jobs: fail-fast: false matrix: include: + - os: ubuntu-latest + version: stable-20230403 + - os: ubuntu-latest + version: stable-v2.13.5 + - os: ubuntu-latest + version: stable-v2.14.6 + - os: ubuntu-latest + version: stable-v2.15.5 + - os: ubuntu-latest + version: stable-v2.16.6 - os: ubuntu-latest version: default - os: ubuntu-latest @@ -66,9 +76,6 @@ jobs: with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - uses: actions/setup-go@v5 with: go-version: '>=1.21.0' diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 17010df62d..135e6e46fb 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -52,9 +52,6 @@ jobs: debug: true debug-artifact-name: my-debug-artifacts debug-database-name: my-db - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - 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 54ed2ed115..d675839772 100644 --- a/.github/workflows/test-codeql-bundle-all.yml +++ b/.github/workflows/test-codeql-bundle-all.yml @@ -43,9 +43,6 @@ jobs: uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash run: ./build.sh diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml index 52ef3e234a..2f1a73303c 100644 --- a/pr-checks/checks/all-platform-bundle.yml +++ b/pr-checks/checks/all-platform-bundle.yml @@ -8,9 +8,6 @@ steps: uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash run: ./build.sh diff --git a/pr-checks/checks/build-mode-manual.yml b/pr-checks/checks/build-mode-manual.yml index 623e06ffc9..add7d04d40 100644 --- a/pr-checks/checks/build-mode-manual.yml +++ b/pr-checks/checks/build-mode-manual.yml @@ -20,10 +20,6 @@ steps: exit 1 fi - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - - name: Build code shell: bash run: ./build.sh diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index f0a8a5d853..759aef849d 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -29,7 +29,7 @@ steps: run: | cd "$RUNNER_TEMP/results" expected_baseline_languages="c csharp go java kotlin javascript python ruby" - if [[ $RUNNER_OS != "Windows" ]]; then + if [[ $RUNNER_OS == "macOS" ]]; then expected_baseline_languages+=" swift" fi diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index b1558cebc2..04f7a0cab1 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -1,14 +1,6 @@ name: "Multi-language repository" description: "An end-to-end integration test of a multi-language repository using automatic language detection" operatingSystems: ["macos", "ubuntu"] -excludeOsAndVersionCombination: [ - # Known failure for Swift on Linux before CLI v2.17.4. - [ "ubuntu", "stable-20230403" ], - [ "ubuntu", "stable-v2.13.5" ], - [ "ubuntu", "stable-v2.14.6" ], - [ "ubuntu", "stable-v2.15.5" ], - [ "ubuntu", "stable-v2.16.6" ], -] steps: - uses: actions/setup-go@v5 with: @@ -21,6 +13,7 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/.github/actions/setup-swift + if: runner.os == 'macOS' with: codeql-path: ${{ steps.init.outputs.codeql-path }} @@ -72,8 +65,8 @@ steps: exit 1 fi - - name: Check language autodetect for Swift - if: runner.os != 'Windows' && matrix.version != 'stable-20230403' + - name: Check language autodetect for Swift on MacOS + if: runner.os == 'macOS' shell: bash run: | SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }} diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index 3bdd0748d5..bde017eaf1 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -1,7 +1,7 @@ name: "Swift analysis using a custom build command" description: "Tests creation of a Swift database using custom build" versions: ["linked", "default", "nightly-latest"] -operatingSystems: ["macos", "ubuntu"] +operatingSystems: ["macos"] env: DOTNET_GENERATE_ASPNET_CERTIFICATE: "false" steps: diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml index 92a73a6f6b..ddf01b65ca 100644 --- a/pr-checks/checks/test-local-codeql.yml +++ b/pr-checks/checks/test-local-codeql.yml @@ -13,9 +13,6 @@ steps: uses: ./../action/init with: tools: ./codeql-bundle-linux64.tar.gz - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash run: ./build.sh diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml index c3803ff1ed..1795ed0eae 100644 --- a/pr-checks/checks/unset-environment.yml +++ b/pr-checks/checks/unset-environment.yml @@ -1,14 +1,6 @@ name: "Test unsetting environment variables" description: "An end-to-end integration test that unsets some environment variables" operatingSystems: ["ubuntu"] -excludeOsAndVersionCombination: [ - # Known failure for Swift on Linux before CLI v2.17.4. - [ "ubuntu", "stable-20230403" ], - [ "ubuntu", "stable-v2.13.5" ], - [ "ubuntu", "stable-v2.14.6" ], - [ "ubuntu", "stable-v2.15.5" ], - [ "ubuntu", "stable-v2.16.6" ], -] steps: - uses: ./../action/init @@ -16,9 +8,6 @@ steps: with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - - uses: ./../action/.github/actions/setup-swift - with: - codeql-path: ${{ steps.init.outputs.codeql-path }} - uses: actions/setup-go@v5 with: go-version: '>=1.21.0'