Skip to content

Commit 5928473

Browse files
committed
Swift: reenable ql tests on macos
1 parent 80ea2b8 commit 5928473

File tree

2 files changed

+36
-21
lines changed

2 files changed

+36
-21
lines changed

.github/workflows/swift.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,18 @@ jobs:
6363
steps:
6464
- uses: actions/checkout@v3
6565
- uses: ./swift/actions/create-extractor-pack
66-
qltests:
66+
qltests-linux:
6767
needs: build-linux
6868
runs-on: ubuntu-latest
6969
steps:
7070
- uses: actions/checkout@v3
71-
- uses: ./swift/actions/env-setup
72-
- uses: ./swift/actions/share-extractor-pack
73-
- name: Test qltest.sh
74-
run: |
75-
bazel test //swift/tools/test/qltest
76-
- uses: ./.github/actions/fetch-codeql
77-
- name: Run QL tests
78-
run: |
79-
codeql test run \
80-
--threads=0 \
81-
--ram 5000 \
82-
--search-path "${{ github.workspace }}/swift/extractor-pack" \
83-
--check-databases \
84-
--check-unused-labels \
85-
--check-repeated-labels \
86-
--check-redefined-labels \
87-
--check-use-before-definition \
88-
ql/test
89-
env:
90-
GITHUB_TOKEN: ${{ github.token }}
71+
- uses: ./swift/actions/run-ql-tests
72+
qltests-macos:
73+
needs: build-macos
74+
runs-on: macos-12-xl
75+
steps:
76+
- uses: actions/checkout@v3
77+
- uses: ./swift/actions/run-ql-tests
9178
integration-tests-linux:
9279
needs: build-linux
9380
runs-on: ubuntu-latest

swift/actions/run-ql-tests/action.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Build Swift CodeQL pack
2+
description: Builds the Swift CodeQL pack
3+
runs:
4+
using: composite
5+
steps:
6+
- uses: ./swift/actions/env-setup
7+
- uses: ./swift/actions/share-extractor-pack
8+
- uses: ./swift/actions/share-extractor-pack
9+
- name: Test qltest.sh
10+
shell: bash
11+
run: |
12+
bazel test //swift/tools/test/qltest
13+
- uses: ./.github/actions/fetch-codeql
14+
- name: Run QL tests
15+
shell: bash
16+
run: |
17+
codeql test run \
18+
--threads=0 \
19+
--ram 5000 \
20+
--search-path "${{ github.workspace }}/swift/extractor-pack" \
21+
--check-databases \
22+
--check-unused-labels \
23+
--check-repeated-labels \
24+
--check-redefined-labels \
25+
--check-use-before-definition \
26+
ql/test
27+
env:
28+
GITHUB_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)