Skip to content

Commit 33d40c9

Browse files
committed
ci: fix release scripts for engine
1 parent 00e258e commit 33d40c9

File tree

30 files changed

+1992
-1851
lines changed

30 files changed

+1992
-1851
lines changed

.github/workflows/release.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,23 @@ jobs:
8383
target: x86_64-unknown-linux-musl
8484
binary_ext: ""
8585
arch: x86_64
86+
- platform: linux
87+
runner: depot-ubuntu-24.04-arm-4
88+
target: aarch64-unknown-linux-musl
89+
binary_ext: ""
90+
arch: aarch64
8691
- platform: windows
8792
runner: depot-ubuntu-24.04-4
8893
target: x86_64-pc-windows-gnu
8994
binary_ext: ".exe"
9095
arch: x86_64
9196
- platform: macos
92-
runner: depot-ubuntu-24.04-4
97+
runner: depot-macos-15
9398
target: x86_64-apple-darwin
9499
binary_ext: ""
95100
arch: x86_64
96101
- platform: macos
97-
runner: depot-ubuntu-24.04-4
102+
runner: depot-macos-15
98103
target: aarch64-apple-darwin
99104
binary_ext: ""
100105
arch: aarch64
@@ -111,9 +116,9 @@ jobs:
111116
run: |
112117
# Use Docker BuildKit
113118
export DOCKER_BUILDKIT=1
114-
119+
115120
# Build the binary using our Dockerfile
116-
docker/engine/build.sh ${{ matrix.target }}
121+
engine/docker/engine/build.sh ${{ matrix.target }}
117122
118123
# Make sure dist directory exists and binary is there
119124
ls -la dist/
@@ -153,15 +158,12 @@ jobs:
153158
strategy:
154159
matrix:
155160
include:
156-
# TODO(RVT-4479): Add back ARM builder once manifest generation fixed
157-
# - platform: linux/arm64
158-
# runner: depot-ubuntu-24.04-4
159-
# arch_suffix: -arm64
161+
- platform: linux/arm64
162+
runner: depot-ubuntu-24.04-arm-4
163+
arch_suffix: -arm64
160164
- platform: linux/x86_64
161165
runner: depot-ubuntu-24.04-4
162-
# TODO: Replace with appropriate arch_suffix when needed
163-
# arch_suffix: -amd64
164-
arch_suffix: ''
166+
arch_suffix: -amd64
165167
runs-on: ${{ matrix.runner }}
166168
steps:
167169
- name: Setup Docker on macOS
@@ -188,7 +190,7 @@ jobs:
188190
context: .
189191
push: true
190192
tags: rivetkit/engine:full-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
191-
file: docker/universal/Dockerfile
193+
file: engine/docker/universal/Dockerfile
192194
target: engine-full
193195
platforms: ${{ matrix.platform }}
194196
build-args: |
@@ -205,7 +207,7 @@ jobs:
205207
context: .
206208
push: true
207209
tags: rivetkit/engine:slim-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
208-
file: docker/universal/Dockerfile
210+
file: engine/docker/universal/Dockerfile
209211
target: engine-slim
210212
platforms: ${{ matrix.platform }}
211213
build-args: |

.github/workflows/rust.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- uses: actions/checkout@v4
35-
35+
3636
- uses: actions-rust-lang/setup-rust-toolchain@v1
3737
with:
3838
toolchain: stable
3939
components: rustfmt
40-
40+
4141
- name: Check formatting
4242
run: cargo fmt --all -- --check
4343

@@ -62,11 +62,11 @@ jobs:
6262
runs-on: depot-ubuntu-24.04
6363
steps:
6464
- uses: actions/checkout@v4
65-
65+
6666
- uses: actions-rust-lang/setup-rust-toolchain@v1
6767
with:
6868
toolchain: stable
69-
69+
7070
- uses: Swatinem/rust-cache@v2
7171

7272
- name: Check
@@ -80,11 +80,11 @@ jobs:
8080
runs-on: depot-ubuntu-24.04
8181
steps:
8282
- uses: actions/checkout@v4
83-
83+
8484
- uses: actions-rust-lang/setup-rust-toolchain@v1
8585
with:
8686
toolchain: stable
87-
87+
8888
- uses: Swatinem/rust-cache@v2
8989

9090
- name: Run tests

engine/artifacts/errors/api.rate_limited.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/namespace.invalid_name.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.input_too_large.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.key_too_large.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.meta_error.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.not_found.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.simple_error.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/artifacts/errors/test.test_error.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)