Skip to content

Commit 4df8236

Browse files
committed
fix: additional ci perf/correctness fixes
Signed-off-by: Sam Gammon <[email protected]>
1 parent 889497b commit 4df8236

File tree

3 files changed

+16
-42
lines changed

3 files changed

+16
-42
lines changed

.github/workflows/job.native-image.yml

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ name: Native Image
161161
# Do not add `ELIDE_VERSION` here like other workflows, or it may interfere with the release version override.
162162
env:
163163
RUST_BACKTRACE: full
164-
SCCACHE_DIRECT: "true"
165-
RUSTC_WRAPPER: "sccache"
166164
BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }}
167165

168166
permissions:
@@ -173,19 +171,8 @@ jobs:
173171
## Job: Library Build
174172
##
175173
gradle:
176-
strategy:
177-
fail-fast: false
178-
matrix:
179-
os: ["${{ inputs.os }}"]
180-
mode: ["Strict"]
181-
machine:
182-
- ${{ inputs.runner }}
183-
arch:
184-
- ${{ inputs.arch }}
185-
186-
name: "Native (${{ matrix.os }}-${{ matrix.arch }})"
187-
runs-on: ${{ matrix.machine }}
188-
continue-on-error: ${{ matrix.mode != 'Strict' }}
174+
name: "Native (${{ inputs.os }}-${{ inputs.arch }})"
175+
runs-on: ${{ inputs.runner }}
189176

190177
permissions:
191178
contents: write
@@ -211,34 +198,23 @@ jobs:
211198
- name: "Setup: Checkout"
212199
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
213200
with:
214-
fetch-depth: 0
201+
fetch-depth: 1
215202
submodules: true
216203
persist-credentials: false
204+
clean: false
217205
token: ${{ secrets.GITHUB_TOKEN }}
218-
- name: "Setup: Cache Restore"
219-
id: cache-restore
220-
uses: buildjet/cache/restore@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2
221-
with:
222-
key: elide-v3-build-${{ hashFiles('gradle/elide.versions.toml') }}
223-
path: |
224-
tools/elide-build/build/**/*.*
225-
packages/*/build/**/*.*
226-
target/
227-
target/x86_64-unknown-linux-gnu/debug/*.a
228-
target/x86_64-unknown-linux-gnu/debug/*.so
229-
third_party/sqlite/install/
230-
restore-keys: |
231-
elide-v3-build-${{ hashFiles('gradle/elide.versions.toml') }}
232-
elide-v3-
233206
- name: "Setup: Packages"
234207
if: contains(inputs.runner, 'ubuntu') || contains(inputs.runner, 'linux')
235208
run: sudo apt-get update && sudo apt-get install -y build-essential libssl-dev libtool libtool-bin
236209
- name: "Setup: Rust"
237210
uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
238211
with:
239212
toolchain: stable
240-
cache: true # handled by sccache
241-
cache-key: "elide-rust-v1-{{ hashFiles('Cargo.lock') }}"
213+
cache: false # handled by sccache
214+
- name: "Setup: Elide"
215+
uses: elide-dev/setup-elide@990b915b2974a70e7654acb1303607b4cd1d3538 # v2
216+
with:
217+
version: "1.0.0-beta10"
242218
- name: "Setup: SCCache"
243219
uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
244220
- name: "Setup: Rust Caching"
@@ -277,13 +253,12 @@ jobs:
277253
- name: "Setup: Gradle"
278254
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
279255
id: gradlebuild
280-
continue-on-error: ${{ matrix.mode == 'labs' }}
281256
env:
282257
CI: true
283258
BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }}
284259
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
285260
with:
286-
cache-read-only: false
261+
cache-read-only: true
287262
cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }}
288263
dependency-graph: disabled
289264
gradle-home-cache-cleanup: true
@@ -350,11 +325,11 @@ jobs:
350325
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
351326
id: build-artifact
352327
with:
353-
name: elide-native-${{ inputs.release == true && 'release' || 'dev' }}-${{ matrix.os }}-${{ matrix.arch }}
328+
name: elide-native-${{ inputs.release == true && 'release' || 'dev' }}-${{ inputs.os }}-${{ inputs.arch }}
354329
path: packages/cli/build/native/nativeOptimizedCompile/**/*.*
355330
- name: "Artifact: Provenance Subject"
356331
id: hash
357-
if: ${{ matrix.os == 'linux' && inputs.release }}
332+
if: ${{ inputs.os == 'linux' && inputs.release }}
358333
run: |
359334
echo "hashes=$(sha256sum ./packages/cli/build/native/nativeOptimizedCompile/elide | base64 -w0)" >> "$GITHUB_OUTPUT"
360335
- name: "🛠️ Release: Package"
@@ -387,5 +362,5 @@ jobs:
387362
id: pack-artifact
388363
if: inputs.pack
389364
with:
390-
name: elide-native-${{ inputs.release == true && 'release' || 'dev' }}-${{ matrix.os }}-${{ matrix.arch }}-release.zip
365+
name: elide-native-${{ inputs.release == true && 'release' || 'dev' }}-${{ inputs.os }}-${{ inputs.arch }}-release.zip
391366
path: staging/**/*.*

.github/workflows/job.native-images.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ name: Native Images
106106
# Do not add `ELIDE_VERSION` here like other workflows, or it may interfere with the release version override.
107107
env:
108108
RUST_BACKTRACE: full
109-
SCCACHE_DIRECT: "true"
110-
RUSTC_WRAPPER: "sccache"
111109
BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }}
112110

113111
permissions:
@@ -128,7 +126,7 @@ jobs:
128126
- amd64
129127
- aarch64
130128

131-
name: "Native (${{ matrix.os }}-${{ matrix.arch }})"
129+
name: "Native Image"
132130

133131
permissions:
134132
contents: write

.gitmodules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
[submodule "apr"]
1313
path = third_party/apache/apr
1414
url = [email protected]:apache/apr.git
15+
shallow = true
1516
ignore = dirty
1617
[submodule "boringssl"]
1718
path = third_party/google/boringssl
1819
url = [email protected]:google/boringssl.git
20+
shallow = true
1921
ignore = dirty
20-

0 commit comments

Comments
 (0)