Swift: remove running integration tests from CI

They are now run internally by QLucie.
Swift: update swift to 5.9 in integration tests
2026-05-16 04:09:27 +02:00 · 2024-04-03 08:36:10 +02:00 · 2024-04-03 08:36:10 +02:00 · 2024-04-03 08:36:10 +02:00 · 2024-04-03 08:36:10 +02:00 · 2024-04-03 08:36:10 +02:00
9 changed files with 55 additions and 126 deletions
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,7 +11,7 @@ common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
 build --repo_env=CC=clang --repo_env=CXX=clang++

 build:linux --cxxopt=-std=c++20
-build:macos --cxxopt=-std=c++20 --cpu=darwin_x86_64
+build:macos --cxxopt=-std=c++20 --platforms=@apple_support//platforms:macos_x86_64
 build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor

 try-import %workspace%/local.bazelrc
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -17,34 +17,28 @@ on:
      - main
      - rc/*
      - codeql-cli-*
-  push:
-    paths:
-      - "swift/**"
-      - "misc/bazel/**"
-      - "misc/codegen/**"
-      - "*.bazel*"
-      - .github/workflows/swift.yml
-      - .github/actions/**
-      - codeql-workspace.yml
-      - "!**/*.md"
-      - "!**/*.qhelp"
-    branches:
-      - main
-      - rc/*
-      - codeql-cli-*

 permissions:
  contents: read

 jobs:
-  # not using a matrix as you cannot depend on a specific job in a matrix, and we want to start linux checks
-  # without waiting for the macOS build
-  build-and-test-macos:
+  # not putting using a matrix as you cannot depend on a specific job in a matrix, and we want to start qltest and
+  # integration tests as soon as the corresponding build required has finished, without waiting for the slowest macOS
+  # build
+  build-and-test-macos-intel:
    if: github.repository_owner == 'github'
-    runs-on: macos-12-xl
+    runs-on: macos-14-large
    steps:
      - uses: actions/checkout@v4
      - uses: ./swift/actions/build-and-test
+  build-and-test-macos-arm:
+    if: github.repository_owner == 'github'
+    runs-on: macos-14-xlarge
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./swift/actions/build-and-test
+        with:
+          upload: false  # use intel build for further tests
  build-and-test-linux:
    if: github.repository_owner == 'github'
    runs-on: ubuntu-latest-xl
@@ -60,26 +54,11 @@ jobs:
      - uses: ./swift/actions/run-ql-tests
  qltests-macos:
    if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
-    needs: build-and-test-macos
-    runs-on: macos-12-xl
+    needs: build-and-test-macos-intel
+    runs-on: macos-14-large
    steps:
      - uses: actions/checkout@v4
      - uses: ./swift/actions/run-ql-tests
-  integration-tests-linux:
-    if: github.repository_owner == 'github'
-    needs: build-and-test-linux
-    runs-on: ubuntu-latest-xl
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./swift/actions/run-integration-tests
-  integration-tests-macos:
-    if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
-    needs: build-and-test-macos
-    runs-on: macos-12-xl
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./swift/actions/run-integration-tests
  clang-format:
    if : ${{ github.event_name == 'pull_request' }}
    runs-on: ubuntu-latest
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -12,7 +12,7 @@ local_path_override(
 )

 # see https://registry.bazel.build/ for a list of available packages
-
+bazel_dep(name = "apple_support", version = "1.14.0")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_pkg", version = "0.9.1")
 bazel_dep(name = "rules_nodejs", version = "6.0.3")
--- a/swift/actions/build-and-test/action.yml
+++ b/swift/actions/build-and-test/action.yml
@@ -1,5 +1,9 @@
 name: Build Swift CodeQL pack
 description: Builds the Swift CodeQL pack
+inputs:
+  upload:
+    description: Whether to upload the extractor pack
+    default: true
 runs:
  using: composite
  steps:
@@ -7,48 +11,11 @@ runs:
    - uses: actions/setup-python@v4
      with:
        python-version-file: 'swift/.python-version'
-    # FIXME: this is copy-pasted from .github/actions/cache-query-compilation, but we cannot factor it out to a common
-    # composite action because of https://github.com/actions/runner/issues/2009 (cache fails to save in the post action
-    # phase because its inputs were lost in the meantime)
-    # calculate the merge-base with main, in a way that works both on PRs and pushes to main.
-    - name: Calculate merge-base
-      shell: bash
-      if: ${{ github.event_name == 'pull_request' }}
-      env:
-        BASE_BRANCH: ${{ github.base_ref }}
-      run: |
-        MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
-        echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
-    - name: Restore read-only cache (PR)
-      if: ${{ github.event_name == 'pull_request' }}
-      uses: actions/cache/restore@v3
-      with:
-        path: 'bazel-cache'
-        key: bazel-pr-${{ github.sha }}
-        restore-keys: |
-          bazel-${{ github.base_ref }}-${{ env.merge_base }}
-          bazel-${{ github.base_ref }}-
-          bazel-main-
-    - name: Fill cache (push)
-      if: ${{ github.event_name != 'pull_request' }}
-      uses: actions/cache@v3
-      with:
-        path: 'bazel-cache'
-        key: bazel-${{ github.ref_name }}-${{ github.sha }} # just fill on main
-        restore-keys: | # restore the latest cache if the exact cache is unavailable, to speed up compilation.
-          bazel-${{ github.ref_name }}-
-          bazel-main-
    - name: Configure bazel
      shell: bash
      run: |
-        mkdir -p bazel-cache/{repository,disk}
-        echo build --repository_cache=bazel-cache/repository --disk_cache=bazel-cache/disk > local.bazelrc
+        echo > local.bazelrc
        echo test --test_output=errors >> local.bazelrc
-    # - name: Print unextracted entities
-    #   shell: bash
-    #   run: |
-    #     bazel run //swift/extractor/print_unextracted
-    - uses: ./swift/actions/share-extractor-pack
    - name: Build Swift extractor
      shell: bash
      run: |
@@ -63,10 +30,6 @@ runs:
      shell: bash
      run: |
        bazel test //swift/...
-    - name: Evict bazel cache
-      if: ${{ github.event_name != 'pull_request' }}
-      shell: bash
-      run: |
-        du -sh bazel-cache/*
-        find bazel-cache -atime +0 -type f -delete
-        du -sh bazel-cache/*
+    - name: Upload
+      if: inputs.upload == 'true'
+      uses: ./swift/actions/upload-extractor-pack
--- a/swift/actions/download-extractor-pack/action.yml
+++ b/swift/actions/download-extractor-pack/action.yml
@@ -0,0 +1,13 @@
+name: Download Swift CodeQL pack
+description: Downloads the Swift CodeQL pack
+runs:
+  using: composite
+  steps:
+    - name: Download
+      uses: actions/download-artifact@v4
+      with:
+        name: swift-extractor-pack-${{ runner.os }}
+    - name: Extract
+      shell: bash
+      run: |
+        zstd -cd swift-extractor-pack-${{ runner.os }}.tar.zst | tar xvf -
--- a/swift/actions/run-integration-tests/action.yml
+++ b/swift/actions/run-integration-tests/action.yml
@@ -1,31 +0,0 @@
-name: Build Swift CodeQL pack
-description: Builds the Swift CodeQL pack
-runs:
-  using: composite
-  steps:
-    - uses: ./swift/actions/share-extractor-pack
-    - uses: actions/setup-python@v4
-      with:
-        python-version-file: 'swift/.python-version'
-    - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
-      with:
-        swift-version: "5.8"
-    - uses: ./.github/actions/fetch-codeql
-    - id: query-cache
-      uses: ./.github/actions/cache-query-compilation
-      with:
-        key: swift-integration
-    - name: Run integration tests
-      shell: bash
-      run: |
-        python swift/ql/integration-tests/runner.py --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
-      env:
-        SEMMLE_DEBUG_TRACER: 10000
-    - name: Upload test logs
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: swift-integration-tests-logs-${{ runner.os }}
-        path: |
-          swift/ql/integration-tests/**/db/log
-        retention-days: 1
--- a/swift/actions/run-ql-tests/action.yml
+++ b/swift/actions/run-ql-tests/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
  using: composite
  steps:
-    - uses: ./swift/actions/share-extractor-pack
+    - uses: ./swift/actions/download-extractor-pack
    - uses: ./.github/actions/fetch-codeql
    - id: query-cache
      uses: ./.github/actions/cache-query-compilation
--- a/swift/actions/share-extractor-pack/action.yml
+++ b/swift/actions/share-extractor-pack/action.yml
@@ -1,11 +0,0 @@
-name: Build Swift CodeQL pack
-description: Builds the Swift CodeQL pack
-runs:
-  using: composite
-  steps:
-    # not using artifacts because of annoying https://github.com/actions/upload-artifact/issues/38
-    - name: Mount cache for sharing extractor pack
-      uses: actions/cache@v3
-      with:
-        path: swift/extractor-pack
-        key: extractor-pack-${{ github.run_id }}-${{ github.run_number }}-${{ runner.os }}
--- a/swift/actions/upload-extractor-pack/action.yml
+++ b/swift/actions/upload-extractor-pack/action.yml
@@ -0,0 +1,16 @@
+name: Upload Swift CodeQL pack
+description: Uploads the Swift CodeQL pack
+runs:
+  using: composite
+  steps:
+    - name: Compress
+      shell: bash
+      run: |
+        tar cf - swift/extractor-pack | zstd > swift-extractor-pack-${{ runner.os }}.tar.zst
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: swift-extractor-pack-${{ runner.os }}
+        path: swift-extractor-pack-${{ runner.os }}.tar.zst
+        compression-level: 0
+        retention-days: 3
Author	SHA1	Message	Date
Paolo Tranquilli	d0644d0b84	Swift: remove running integration tests from CI They are now run internally by QLucie.	2024-04-03 08:36:10 +02:00
Paolo Tranquilli	e452ff678f	Swift: update swift to 5.9 in integration tests	2024-04-03 08:36:10 +02:00
Paolo Tranquilli	2b486311f6	Swift: move CI to macos 14	2024-04-03 08:36:10 +02:00
Paolo Tranquilli	246059160e	Swift: move running to intel The problems running on arm are concerning, but may be caused by not building with the internal macOS toolchain. We'll do separate work internally to investigate and possibly fix that. In the meantime, we can keep testing on intel as is currently done in main.	2024-04-03 08:36:10 +02:00
Paolo Tranquilli	4ad597e967	Swift: add ARM build to CI, and other fixes Also: * removed the pretty much non-functioning bazel cache, will come back to it when we have a broader solution * replaced sharing the extractor pack via cache with uploading and downloading it	2024-04-03 08:36:10 +02:00
Paolo Tranquilli	b8b2c5f44a	Swift: fix local build on ARM macOS As pointed out in https://github.com/bazelbuild/bazel/issues/21768, bazel 7 moved multi-arch macOS toolchain support to `apple_support`, so building Swift (which must target `x86_64` for now) was broken. Internally in the codeql CLI we were unaffected as we use a custom bundled toolchain. This fixes building from this repository.	2024-04-03 08:36:10 +02:00