|
53 | 53 | name: Build on Ubuntu |
54 | 54 | needs: [configure] |
55 | 55 | runs-on: ubuntu-latest |
56 | | - container: ${{ (matrix.type == 'wasm' || matrix.type == 'wasm-embedded') && 'swift:6.3-noble' || matrix.swift.nightly && format('swiftlang/swift:nightly-{0}-{1}', matrix.swift.version, matrix.os) || format('swift:{0}-{1}', matrix.swift.version, matrix.os) }} |
| 56 | + container: ${{ matrix.swift.nightly && format('swiftlang/swift:nightly-{0}-{1}', matrix.swift.version, matrix.os) || format('swift:{0}-{1}', matrix.swift.version, matrix.os) }} |
57 | 57 | strategy: |
58 | 58 | matrix: |
59 | 59 | os: ${{ fromJSON(needs.configure.outputs.ubuntu-os) }} |
@@ -95,26 +95,26 @@ jobs: |
95 | 95 | fail-fast: false |
96 | 96 | matrix: |
97 | 97 | runs-on: [windows-2022, windows-2025] |
98 | | - include: |
99 | | - - swift-version: swift-6.3-release |
100 | | - swift-build: 6.3-RELEASE |
101 | | - - swift-version: swift-6.2-release |
102 | | - swift-build: 6.2-RELEASE |
103 | | - - swift-version: swift-6.1-release |
104 | | - swift-build: 6.1-RELEASE |
| 98 | + swift: |
| 99 | + - version: swift-6.3-release |
| 100 | + build: 6.3-RELEASE |
| 101 | + - version: swift-6.2-release |
| 102 | + build: 6.2-RELEASE |
| 103 | + - version: swift-6.1-release |
| 104 | + build: 6.1-RELEASE |
105 | 105 | steps: |
106 | 106 | - uses: actions/checkout@v6 |
107 | 107 | - uses: brightdigit/swift-build@v1.5.2 |
108 | 108 | id: build |
109 | 109 | with: |
110 | | - windows-swift-version: ${{ matrix.swift-version }} |
111 | | - windows-swift-build: ${{ matrix.swift-build }} |
| 110 | + windows-swift-version: ${{ matrix.swift.version }} |
| 111 | + windows-swift-build: ${{ matrix.swift.build }} |
112 | 112 | - name: Upload coverage to Codecov |
113 | 113 | if: steps.build.outputs.contains-code-coverage == 'true' |
114 | 114 | uses: codecov/codecov-action@v6 |
115 | 115 | with: |
116 | 116 | fail_ci_if_error: true |
117 | | - flags: swift-${{ matrix.swift-version }},windows |
| 117 | + flags: swift-${{ matrix.swift.version }},windows |
118 | 118 | verbose: true |
119 | 119 | token: ${{ secrets.CODECOV_TOKEN }} |
120 | 120 | os: windows |
@@ -164,7 +164,7 @@ jobs: |
164 | 164 | build-macos-full: |
165 | 165 | name: Build on macOS (Full) |
166 | 166 | needs: [configure] |
167 | | - if: needs.configure.outputs.full-matrix == 'true' |
| 167 | + if: ${{ !cancelled() && needs.configure.result == 'success' && needs.configure.outputs.full-matrix == 'true' }} |
168 | 168 | env: |
169 | 169 | PACKAGE_NAME: SyntaxKit |
170 | 170 | runs-on: ${{ matrix.runs-on }} |
@@ -287,7 +287,7 @@ jobs: |
287 | 287 |
|
288 | 288 | lint: |
289 | 289 | name: Linting |
290 | | - if: ${{ !cancelled() && !failure() && !contains(github.event.head_commit.message, 'ci skip') }} |
| 290 | + if: ${{ !cancelled() && !failure() && (github.event_name == 'pull_request' || !contains(github.event.head_commit.message, 'ci skip')) }} |
291 | 291 | runs-on: ubuntu-latest |
292 | 292 | needs: [build-ubuntu, build-macos, build-windows, build-macos-full, build-android] |
293 | 293 | env: |
@@ -318,7 +318,7 @@ jobs: |
318 | 318 |
|
319 | 319 | docs: |
320 | 320 | name: Documentation Validation |
321 | | - if: ${{ !cancelled() && !failure() && !contains(github.event.head_commit.message, 'ci skip') }} |
| 321 | + if: ${{ !cancelled() && !failure() && (github.event_name == 'pull_request' || !contains(github.event.head_commit.message, 'ci skip')) }} |
322 | 322 | needs: [build-ubuntu, build-macos, build-windows, build-macos-full, build-android] |
323 | 323 | runs-on: ubuntu-latest |
324 | 324 | steps: |
|
0 commit comments