Skip to content

Commit e7b9a08

Browse files
authored
[CI] Use Ubuntu 24.04 image, more code coverage, disable CodeQL completely (#482)
* [CI] Use Ubuntu 24.04 image for Swift 5.10, upload code coverage more often, completely disable CodeQL * Add CODEOWNERS
1 parent 5c26876 commit e7b9a08

File tree

2 files changed

+23
-28
lines changed

2 files changed

+23
-28
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @fabianfett @gwynne

.github/workflows/test.yml

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ jobs:
2121
- swift:5.7-jammy
2222
- swift:5.8-jammy
2323
- swift:5.9-jammy
24-
- swift:5.10-jammy
24+
- swift:5.10-noble
2525
- swiftlang/swift:nightly-6.0-jammy
2626
- swiftlang/swift:nightly-main-jammy
27-
include:
28-
- swift-image: swift:5.10-jammy
29-
code-coverage: true
3027
container: ${{ matrix.swift-image }}
3128
runs-on: ubuntu-latest
3229
steps:
@@ -40,12 +37,9 @@ jobs:
4037
- name: Check out package
4138
uses: actions/checkout@v4
4239
- name: Run unit tests with Thread Sanitizer
43-
env:
44-
CODE_COVERAGE: ${{ matrix.code-coverage && '--enable-code-coverage' || '' }}
4540
run: |
46-
swift test --filter='^(PostgresNIOTests|ConnectionPoolModuleTests)' --sanitize=thread ${CODE_COVERAGE}
41+
swift test --filter='^(PostgresNIOTests|ConnectionPoolModuleTests)' --sanitize=thread --enable-code-coverage
4742
- name: Submit code coverage
48-
if: ${{ matrix.code-coverage }}
4943
uses: vapor/swift-codecov-action@v0.3
5044
with:
5145
codecov_token: ${{ secrets.CODECOV_TOKEN }}
@@ -66,7 +60,7 @@ jobs:
6660
- postgres-image: postgres:12
6761
postgres-auth: trust
6862
container:
69-
image: swift:5.10-jammy
63+
image: swift:5.10-noble
7064
volumes: [ 'pgrunshare:/var/run/postgresql' ]
7165
runs-on: ubuntu-latest
7266
env:
@@ -183,7 +177,7 @@ jobs:
183177
api-breakage:
184178
if: github.event_name == 'pull_request'
185179
runs-on: ubuntu-latest
186-
container: swift:jammy
180+
container: swift:noble
187181
steps:
188182
- name: Checkout
189183
uses: actions/checkout@v4
@@ -195,21 +189,21 @@ jobs:
195189
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
196190
swift package diagnose-api-breaking-changes origin/main
197191
198-
gh-codeql:
199-
if: ${{ false }}
200-
runs-on: ubuntu-latest
201-
container: swift:jammy
202-
permissions: { actions: write, contents: read, security-events: write }
203-
steps:
204-
- name: Check out code
205-
uses: actions/checkout@v4
206-
- name: Mark repo safe in non-fake global config
207-
run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
208-
- name: Initialize CodeQL
209-
uses: github/codeql-action/init@v3
210-
with:
211-
languages: swift
212-
- name: Perform build
213-
run: swift build
214-
- name: Run CodeQL analyze
215-
uses: github/codeql-action/analyze@v3
192+
# gh-codeql:
193+
# if: ${{ false }}
194+
# runs-on: ubuntu-latest
195+
# container: swift:noble
196+
# permissions: { actions: write, contents: read, security-events: write }
197+
# steps:
198+
# - name: Check out code
199+
# uses: actions/checkout@v4
200+
# - name: Mark repo safe in non-fake global config
201+
# run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
202+
# - name: Initialize CodeQL
203+
# uses: github/codeql-action/init@v3
204+
# with:
205+
# languages: swift
206+
# - name: Perform build
207+
# run: swift build
208+
# - name: Run CodeQL analyze
209+
# uses: github/codeql-action/analyze@v3

0 commit comments

Comments
 (0)