Skip to content

Commit 1fd2b52

Browse files
committed
ci: fix release scripts for engine
1 parent 21324dd commit 1fd2b52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2067
-1889
lines changed

.dockerignore

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# MARK: Docker-specific
22
.git/
3+
.gitignore
4+
.gitattributes
5+
.dockerignore
6+
**/Dockerfile*
7+
**/docker-compose*.yml
8+
9+
# CI/CD
10+
.github/
11+
.gitlab-ci.yml
12+
.travis.yml
13+
.circleci/
14+
15+
# Documentation
16+
*.md
17+
!README.md
18+
docs/
19+
LICENSE*
20+
21+
# Editor configs
22+
.vscode/
23+
.idea/
24+
*.swp
25+
*.swo
26+
*~
327

428
# MARK: Copied from .gitignore
529
**/.DS_Store

.github/workflows/release.yaml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,25 @@ jobs:
8383
target: x86_64-unknown-linux-musl
8484
binary_ext: ""
8585
arch: x86_64
86+
# TODO: Add back when working
87+
# - platform: linux
88+
# runner: depot-ubuntu-24.04-arm-4
89+
# target: aarch64-unknown-linux-musl
90+
# binary_ext: ""
91+
# arch: aarch64
8692
- platform: windows
8793
runner: depot-ubuntu-24.04-4
8894
target: x86_64-pc-windows-gnu
8995
binary_ext: ".exe"
9096
arch: x86_64
9197
- platform: macos
98+
# Use Linux instead of macOS builders since macOS does not support Docker
9299
runner: depot-ubuntu-24.04-4
93100
target: x86_64-apple-darwin
94101
binary_ext: ""
95102
arch: x86_64
96103
- platform: macos
104+
# Use Linux instead of macOS builders since macOS does not support Docker
97105
runner: depot-ubuntu-24.04-4
98106
target: aarch64-apple-darwin
99107
binary_ext: ""
@@ -111,9 +119,9 @@ jobs:
111119
run: |
112120
# Use Docker BuildKit
113121
export DOCKER_BUILDKIT=1
114-
122+
115123
# Build the binary using our Dockerfile
116-
docker/engine/build.sh ${{ matrix.target }}
124+
engine/docker/engine/build.sh ${{ matrix.target }}
117125
118126
# Make sure dist directory exists and binary is there
119127
ls -la dist/
@@ -153,15 +161,12 @@ jobs:
153161
strategy:
154162
matrix:
155163
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
164+
- platform: linux/arm64
165+
runner: depot-ubuntu-24.04-arm-4
166+
arch_suffix: -arm64
160167
- platform: linux/x86_64
161168
runner: depot-ubuntu-24.04-4
162-
# TODO: Replace with appropriate arch_suffix when needed
163-
# arch_suffix: -amd64
164-
arch_suffix: ''
169+
arch_suffix: -amd64
165170
runs-on: ${{ matrix.runner }}
166171
steps:
167172
- name: Setup Docker on macOS
@@ -188,7 +193,7 @@ jobs:
188193
context: .
189194
push: true
190195
tags: rivetkit/engine:full-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
191-
file: docker/universal/Dockerfile
196+
file: engine/docker/universal/Dockerfile
192197
target: engine-full
193198
platforms: ${{ matrix.platform }}
194199
build-args: |
@@ -205,7 +210,7 @@ jobs:
205210
context: .
206211
push: true
207212
tags: rivetkit/engine:slim-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
208-
file: docker/universal/Dockerfile
213+
file: engine/docker/universal/Dockerfile
209214
target: engine-slim
210215
platforms: ${{ matrix.platform }}
211216
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

biome.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"rules": {
3232
"recommended": true,
3333
"style": {
34-
"noUselessElse": "off"
34+
"noUselessElse": "off",
35+
"useNodejsImportProtocol": "error"
3536
},
3637
"correctness": {
3738
"noUnusedImports": "warn"

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.

0 commit comments

Comments
 (0)