-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* This logging is handled in MySQLKit and should not be present at the MySQLNIO layer. * Fix CI
- Loading branch information
Showing
4 changed files
with
32 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,24 +22,6 @@ env: | |
MYSQL_HOSTNAME_B: 'mysql-b' | ||
|
||
jobs: | ||
dependency-graph: | ||
if: ${{ github.event_name == 'push' }} | ||
runs-on: ubuntu-latest | ||
container: swift:jammy | ||
permissions: | ||
contents: write | ||
steps: | ||
- name: Check out code | ||
uses: actions/checkout@v4 | ||
- name: Fix Git configuration | ||
run: | | ||
git config --global --add safe.directory "${GITHUB_WORKSPACE}" | ||
apt-get update && apt-get install -y curl | ||
- name: Submit dependency graph | ||
uses: vapor-community/[email protected] | ||
with: | ||
path: ${{ github.workspace }} | ||
|
||
api-breakage: | ||
if: ${{ !(github.event.pull_request.draft || false) }} | ||
runs-on: ubuntu-latest | ||
|
@@ -53,33 +35,26 @@ jobs: | |
git config --global --add safe.directory "${GITHUB_WORKSPACE}" | ||
swift package diagnose-api-breaking-changes origin/main | ||
gh-codeql: | ||
if: ${{ !(github.event.pull_request.draft || false) }} | ||
runs-on: ubuntu-latest | ||
container: | ||
image: swift:5.9-jammy | ||
permissions: { actions: write, contents: read, security-events: write } | ||
timeout-minutes: 60 | ||
steps: | ||
- name: Check out code | ||
uses: actions/checkout@v4 | ||
- name: Mark repo safe in non-fake global config | ||
run: | | ||
git config --global --add safe.directory "${GITHUB_WORKSPACE}" | ||
- name: Check Swift compatibility | ||
id: swift-check | ||
uses: vapor/ci/.github/actions/check-compatible-swift@main | ||
- name: Initialize CodeQL | ||
if: ${{ steps.swift-check.outputs.swift-compatible == 'true' }} | ||
uses: github/codeql-action/init@v3 | ||
with: { languages: swift } | ||
- name: Perform build | ||
if: ${{ steps.swift-check.outputs.swift-compatible == 'true' }} | ||
run: | | ||
swift build | ||
- name: Run CodeQL analyze | ||
if: ${{ steps.swift-check.outputs.swift-compatible == 'true' }} | ||
uses: github/codeql-action/analyze@v3 | ||
# gh-codeql: | ||
# if: ${{ !(github.event.pull_request.draft || false) }} | ||
# runs-on: ubuntu-latest | ||
# permissions: { actions: write, contents: read, security-events: write } | ||
# timeout-minutes: 30 | ||
# steps: | ||
# - name: Install latest Swift toolchain | ||
# uses: vapor/[email protected] | ||
# with: { toolchain: latest } | ||
# - name: Check out code | ||
# uses: actions/checkout@v4 | ||
# - name: Fix Git configuration | ||
# run: 'git config --global --add safe.directory "${GITHUB_WORKSPACE}"' | ||
# - name: Initialize CodeQL | ||
# uses: github/codeql-action/init@v3 | ||
# with: { languages: swift } | ||
# - name: Perform build | ||
# run: 'swift build ${PACKAGE_ROOT} ${EXTRA_FLAGS}' | ||
# - name: Run CodeQL analyze | ||
# uses: github/codeql-action/analyze@v3 | ||
|
||
linux-all: | ||
if: ${{ !(github.event.pull_request.draft || false) }} | ||
|
@@ -94,10 +69,10 @@ jobs: | |
- percona:5.7 | ||
- percona:8 | ||
swiftver: | ||
- swift:5.7-jammy | ||
- swift:5.8-jammy | ||
- swift:5.9-jammy | ||
- swiftlang/swift:nightly-5.10-jammy | ||
- swift:5.10-jammy | ||
- swiftlang/swift:nightly-6.0-jammy | ||
- swiftlang/swift:nightly-main-jammy | ||
runs-on: ubuntu-latest | ||
container: ${{ matrix.swiftver }} | ||
|
@@ -115,8 +90,9 @@ jobs: | |
- name: Run unit tests | ||
run: swift test --package-path mysql-nio --enable-code-coverage --sanitize=thread | ||
- name: Upload code coverage | ||
uses: vapor/swift-codecov-action@v0.2 | ||
uses: vapor/swift-codecov-action@v0.3 | ||
with: | ||
codecov_token: ${{ secrets.CODECOV_TOKEN }} | ||
package_path: 'mysql-nio' | ||
- name: Check out mysql-kit dependent | ||
uses: actions/checkout@v4 | ||
|
@@ -139,18 +115,19 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
dbimage: [mysql, mariadb, percona-server] | ||
xcode: ['~14.3', 'latest'] | ||
macos: ['macos-13'] | ||
macos-version: ['macos-13', 'macos-14'] | ||
include: | ||
- { username: root } | ||
- { dbimage: mariadb, username: runner } | ||
runs-on: ${{ matrix.macos }} | ||
- { macos-version: 'macos-13', xcode-version: '~15.2' } | ||
- { macos-version: 'macos-14', xcode-version: 'latest' } | ||
runs-on: ${{ matrix.macos-version }} | ||
env: { MYSQL_HOSTNAME: '127.0.0.1' } | ||
steps: | ||
- name: Select latest available Xcode | ||
uses: maxim-lobanov/setup-xcode@v1 | ||
with: | ||
xcode-version: ${{ matrix.xcode }} | ||
xcode-version: ${{ matrix.xcode-version }} | ||
- name: Install MySQL, setup DB and auth, and wait for server start | ||
env: | ||
FORMULA: ${{ matrix.dbimage }} | ||
|
@@ -171,4 +148,6 @@ jobs: | |
- name: Run all tests | ||
run: swift test --sanitize=thread --enable-code-coverage | ||
- name: Upload code coverage | ||
uses: vapor/[email protected] | ||
uses: vapor/[email protected] | ||
with: | ||
codecov_token: ${{ secrets.CODECOV_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters