Skip to content

Commit b6465c7

Browse files
qiaoyuangclaude
andcommitted
Optimize GitHub Actions workflows
- Fix artifact name collisions by using platform-specific names (Test-Reports-macOS-driver, Test-Reports-Windows-driver, etc.) - Remove redundant Gradle cache since gradle/actions/setup-gradle@v4 handles it automatically - Improve Kotlin/Native cache configuration with better key patterns and restore-keys - Update cache key to include all nested gradle.kts files for better accuracy These changes improve build performance, prevent test report overwrites, and reduce workflow complexity. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent 0ebbd5c commit b6465c7

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

.github/workflows/build.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212

1313
build-on-macos:
14-
runs-on: macos-13
14+
runs-on: macos-15-intel
1515
timeout-minutes: 60
1616

1717
steps:
@@ -30,14 +30,14 @@ jobs:
3030
- name: Setup Gradle
3131
uses: gradle/actions/setup-gradle@v4
3232

33-
- name: Cache Build Tooling
33+
- name: Cache Kotlin/Native
3434
uses: actions/cache@v4
3535
with:
36-
path: |
37-
~/.gradle/caches
38-
~/.konan
39-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
40-
36+
path: ~/.konan
37+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
38+
restore-keys: |
39+
${{ runner.os }}-konan-
40+
4141
- name: Build sqllin-driver
4242
run: ./gradlew :sqllin-driver:assemble -PonCICD
4343

@@ -73,7 +73,7 @@ jobs:
7373
target: google_apis
7474
arch: x86_64
7575
profile: pixel_6
76-
emulator-build: 13701740
76+
emulator-build: 14257411
7777
force-avd-creation: false
7878
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
7979
disable-animations: true
@@ -86,7 +86,7 @@ jobs:
8686
target: google_apis
8787
arch: x86_64
8888
profile: pixel_6
89-
emulator-build: 13701740
89+
emulator-build: 14257411
9090
force-avd-creation: false
9191
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
9292
disable-animations: true
@@ -95,14 +95,14 @@ jobs:
9595
- name: Upload sqllin-driver Reports
9696
uses: actions/upload-artifact@v4
9797
with:
98-
name: Test-Reports
98+
name: Test-Reports-macOS-driver
9999
path: sqllin-driver/build/reports
100100
if: failure()
101101

102102
- name: Upload sqllin-dsl Reports
103103
uses: actions/upload-artifact@v4
104104
with:
105-
name: Test-Reports
105+
name: Test-Reports-macOS-dsl
106106
path: sqllin-dsl/build/reports
107107
if: failure()
108108

@@ -126,13 +126,13 @@ jobs:
126126
- name: Setup Gradle
127127
uses: gradle/actions/setup-gradle@v4
128128

129-
- name: Cache Build Tooling
129+
- name: Cache Kotlin/Native
130130
uses: actions/cache@v4
131131
with:
132-
path: |
133-
~/.gradle/caches
134-
~/.konan
135-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
132+
path: ~/.konan
133+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
134+
restore-keys: |
135+
${{ runner.os }}-konan-
136136
137137
- name: Build sqllin-driver
138138
run: ./gradlew :sqllin-driver:mingwX64MainKlibrary
@@ -155,14 +155,14 @@ jobs:
155155
- name: Upload sqllin-driver Reports
156156
uses: actions/upload-artifact@v4
157157
with:
158-
name: Test-Reports
158+
name: Test-Reports-Windows-driver
159159
path: sqllin-driver/build/reports
160160
if: failure()
161161

162162
- name: Upload sqllin-dsl Reports
163163
uses: actions/upload-artifact@v4
164164
with:
165-
name: Test-Reports
165+
name: Test-Reports-Windows-dsl
166166
path: sqllin-dsl/build/reports
167167
if: failure()
168168

@@ -186,13 +186,13 @@ jobs:
186186
- name: Setup Gradle
187187
uses: gradle/actions/setup-gradle@v4
188188

189-
- name: Cache Build Tooling
189+
- name: Cache Kotlin/Native
190190
uses: actions/cache@v4
191191
with:
192-
path: |
193-
~/.gradle/caches
194-
~/.konan
195-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
192+
path: ~/.konan
193+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
194+
restore-keys: |
195+
${{ runner.os }}-konan-
196196
197197
- name: Build sqllin-driver
198198
run: ./gradlew :sqllin-driver:assemble -PonCICD
@@ -232,7 +232,7 @@ jobs:
232232
target: default
233233
arch: x86_64
234234
profile: pixel_2
235-
emulator-build: 13701740
235+
emulator-build: 14257411
236236
force-avd-creation: false
237237
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
238238
disable-animations: true
@@ -245,7 +245,7 @@ jobs:
245245
target: default
246246
arch: x86_64
247247
profile: pixel_2
248-
emulator-build: 13701740
248+
emulator-build: 14257411
249249
force-avd-creation: false
250250
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
251251
disable-animations: true
@@ -254,13 +254,13 @@ jobs:
254254
- name: Upload sqllin-driver Reports
255255
uses: actions/upload-artifact@v4
256256
with:
257-
name: Test-Reports
257+
name: Test-Reports-Linux-driver
258258
path: sqllin-driver/build/reports
259259
if: failure()
260260

261261
- name: Upload sqllin-dsl Reports
262262
uses: actions/upload-artifact@v4
263263
with:
264-
name: Test-Reports
264+
name: Test-Reports-Linux-dsl
265265
path: sqllin-dsl/build/reports
266266
if: failure()

.github/workflows/publish.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414

1515
build-on-macos:
16-
runs-on: macos-13
16+
runs-on: macos-15-intel
1717
timeout-minutes: 60
1818

1919
steps:
@@ -32,13 +32,13 @@ jobs:
3232
- name: Setup Gradle
3333
uses: gradle/actions/setup-gradle@v4
3434

35-
- name: Cache Build Tooling
35+
- name: Cache Kotlin/Native
3636
uses: actions/cache@v4
3737
with:
38-
path: |
39-
~/.gradle/caches
40-
~/.konan
41-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
38+
path: ~/.konan
39+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
40+
restore-keys: |
41+
${{ runner.os }}-konan-
4242
4343
- name: Build sqllin-driver
4444
run: ./gradlew :sqllin-driver:assemble -PonCICD
@@ -69,13 +69,13 @@ jobs:
6969
- name: Setup Gradle
7070
uses: gradle/actions/setup-gradle@v4
7171

72-
- name: Cache Build Tooling
72+
- name: Cache Kotlin/Native
7373
uses: actions/cache@v4
7474
with:
75-
path: |
76-
~/.gradle/caches
77-
~/.konan
78-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
75+
path: ~/.konan
76+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
77+
restore-keys: |
78+
${{ runner.os }}-konan-
7979
8080
- name: Build sqllin-driver
8181
run: ./gradlew :sqllin-driver:mingwX64MainKlibrary
@@ -106,13 +106,13 @@ jobs:
106106
- name: Setup Gradle
107107
uses: gradle/actions/setup-gradle@v4
108108

109-
- name: Cache Build Tooling
109+
- name: Cache Kotlin/Native
110110
uses: actions/cache@v4
111111
with:
112-
path: |
113-
~/.gradle/caches
114-
~/.konan
115-
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
112+
path: ~/.konan
113+
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}
114+
restore-keys: |
115+
${{ runner.os }}-konan-
116116
117117
- name: Build sqllin-driver
118118
run: ./gradlew :sqllin-driver:assemble -PonCICD

0 commit comments

Comments
 (0)