Skip to content

Commit a4263fd

Browse files
MasterPtatoMasterPtato
committed
fix(ci): get binaries uploading
1 parent 3bcc74f commit a4263fd

File tree

154 files changed

+348
-5599
lines changed

Some content is hidden

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

154 files changed

+348
-5599
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ jobs:
5555
# git config --global user.name "github-actions[bot]"
5656
# git config --global user.email "github-actions[bot]@users.noreply.github.com"
5757

58-
# # Install Deno
59-
# curl -fsSL https://deno.land/x/install/install.sh | sh
60-
# export PATH=$HOME/.deno/bin:$PATH
61-
6258
# # Authenticate with NPM
6359
# cat << EOF > ~/.npmrc
6460
# //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
6561
# EOF
6662

63+
# # Install dependencies
6764
# pnpm install
6865

66+
# # Install tsx globally
67+
# npm install -g tsx
68+
6969
# if [ "${{ inputs.latest }}" = "true" ]; then
7070
# ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --setupCi
7171
# else
@@ -124,8 +124,8 @@ jobs:
124124
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_RELEASES_SECRET_ACCESS_KEY }}
125125
run: |
126126
# Install dependencies for AWS CLI
127-
apt-get update
128-
apt-get install -y unzip curl
127+
sudo apt-get update
128+
sudo apt-get install -y unzip curl
129129
130130
# Install AWS CLI - use ARM version if running on ARM architecture
131131
if [ "${{ matrix.arch }}" = "aarch64" ]; then
@@ -134,7 +134,7 @@ jobs:
134134
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
135135
fi
136136
unzip awscliv2.zip
137-
./aws/install --update
137+
sudo ./aws/install --update
138138
139139
COMMIT_SHA_SHORT="${GITHUB_SHA::7}"
140140
BINARY_PATH="dist/rivet-engine-${{ matrix.target }}${{ matrix.binary_ext }}"
@@ -147,73 +147,68 @@ jobs:
147147
--endpoint-url https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com/rivet-engine-releases \
148148
--checksum-algorithm CRC32
149149
150-
docker:
151-
name: "Build & Push Docker Images"
152-
# needs: [setup]
153-
strategy:
154-
matrix:
155-
include:
156-
# TODO(RVT-4479): Add back ARM builder once manifest generation fixed
157-
# - platform: linux/arm64
158-
# runner: ubuntu-latest
159-
# arch_suffix: -arm64
160-
- platform: linux/x86_64
161-
runner: ubuntu-latest
162-
# TODO: Replace with appropriate arch_suffix when needed
163-
# arch_suffix: -amd64
164-
arch_suffix: ''
165-
runs-on: ${{ matrix.runner }}
166-
steps:
167-
- name: Setup Docker on macOS
168-
if: runner.os == 'macOS'
169-
uses: douglascamata/setup-docker-macos-action@v1-alpha
170-
171-
- uses: actions/checkout@v4
150+
# docker:
151+
# name: "Build & Push Docker Images"
152+
# needs: [setup]
153+
# strategy:
154+
# matrix:
155+
# include:
156+
# # TODO(RVT-4479): Add back ARM builder once manifest generation fixed
157+
# # - platform: linux/arm64
158+
# # runner: ubuntu-latest
159+
# # arch_suffix: -arm64
160+
# - platform: linux/x86_64
161+
# runner: ubuntu-latest
162+
# # TODO: Replace with appropriate arch_suffix when needed
163+
# # arch_suffix: -amd64
164+
# arch_suffix: ''
165+
# runs-on: ${{ matrix.runner }}
166+
# steps:
167+
# - name: Setup Docker on macOS
168+
# if: runner.os == 'macOS'
169+
# uses: douglascamata/setup-docker-macos-action@v1-alpha
172170

173-
# Required for running in Docker
174-
- name: Git LFS Pull
175-
run: |
176-
apt-get update
177-
apt-get install git-lfs
178-
git lfs pull
171+
# - uses: actions/checkout@v4
172+
# with:
173+
# lfs: true
179174

180-
- name: Set outputs
181-
id: vars
182-
run: echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
175+
# - name: Set outputs
176+
# id: vars
177+
# run: echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
183178

184-
- uses: ./.github/actions/docker-setup
185-
with:
186-
docker_username: ${{ secrets.DOCKER_CI_USERNAME }}
187-
docker_password: ${{ secrets.DOCKER_CI_ACCESS_TOKEN }}
188-
github_token: ${{ secrets.GITHUB_TOKEN}}
179+
# - uses: ./.github/actions/docker-setup
180+
# with:
181+
# docker_username: ${{ secrets.DOCKER_CI_USERNAME }}
182+
# docker_password: ${{ secrets.DOCKER_CI_ACCESS_TOKEN }}
183+
# github_token: ${{ secrets.GITHUB_TOKEN}}
189184

190-
- name: Build & Push (rivetgg/engine:full)
191-
uses: docker/build-push-action@v4
192-
with:
193-
context: .
194-
push: true
195-
tags: rivetgg/rivet-engine:full-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
196-
file: docker/universal/Dockerfile
197-
target: engine-full
198-
platforms: ${{ matrix.platform }}
199-
# secrets: |
200-
# fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
201-
# secret-files: |
202-
# netrc=${{ runner.temp }}/netrc
203-
204-
- name: Build & Push (rivetgg/engine:slim)
205-
uses: docker/build-push-action@v4
206-
with:
207-
context: .
208-
push: true
209-
tags: rivetgg/rivet-engine:slim-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
210-
file: docker/universal/Dockerfile
211-
target: engine-slim
212-
platforms: ${{ matrix.platform }}
213-
# secrets: |
214-
# fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
215-
# secret-files: |
216-
# netrc=${{ runner.temp }}/netrc
185+
# - name: Build & Push (rivetgg/engine:full)
186+
# uses: docker/build-push-action@v4
187+
# with:
188+
# context: .
189+
# push: true
190+
# tags: rivetgg/rivet-engine:full-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
191+
# file: docker/universal/Dockerfile
192+
# target: engine-full
193+
# platforms: ${{ matrix.platform }}
194+
# # secrets: |
195+
# # fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
196+
# # secret-files: |
197+
# # netrc=${{ runner.temp }}/netrc
198+
199+
# - name: Build & Push (rivetgg/engine:slim)
200+
# uses: docker/build-push-action@v4
201+
# with:
202+
# context: .
203+
# push: true
204+
# tags: rivetgg/rivet-engine:slim-${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
205+
# file: docker/universal/Dockerfile
206+
# target: engine-slim
207+
# platforms: ${{ matrix.platform }}
208+
# # secrets: |
209+
# # fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
210+
# # secret-files: |
211+
# # netrc=${{ runner.temp }}/netrc
217212

218213
# complete:
219214
# name: "Complete"
@@ -224,6 +219,12 @@ jobs:
224219
# with:
225220
# lfs: 'true'
226221

222+
# - uses: actions/setup-node@v4
223+
# with:
224+
# node-version: 20
225+
226+
# - run: corepack enable
227+
227228
# - uses: ./.github/actions/docker-setup
228229
# with:
229230
# docker_username: ${{ secrets.DOCKER_CI_USERNAME }}
@@ -235,12 +236,14 @@ jobs:
235236
# R2_RELEASES_ACCESS_KEY_ID: ${{ secrets.R2_RELEASES_ACCESS_KEY_ID }}
236237
# R2_RELEASES_SECRET_ACCESS_KEY: ${{ secrets.R2_RELEASES_SECRET_ACCESS_KEY }}
237238
# run: |
238-
# # Install Deno
239-
# curl -fsSL https://deno.land/x/install/install.sh | sh
240-
# export PATH=$HOME/.deno/bin:$PATH
239+
# # Install dependencies
240+
# pnpm install
241+
242+
# # Install tsx globally
243+
# npm install -g tsx
241244

242245
# if [ "${{ inputs.latest }}" = "true" ]; then
243246
# ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --completeCi
244247
# else
245248
# ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --no-latest --completeCi
246-
# fi
249+
# fi

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[workspace]
33
resolver = "2"
4-
members = ["packages/common/api-builder","packages/common/api-client","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/udb-util","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner-ws","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/api-runtime","sdks/rust/bare_gen","sdks/rust/epoxy-protocol","sdks/rust/key-data","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol"]
4+
members = ["packages/common/api-builder","packages/common/api-client","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/udb-util","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner-ws","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/epoxy-protocol","sdks/rust/key-data","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol"]
55

66
[workspace.package]
77
version = "0.0.1"
@@ -58,7 +58,6 @@ regex = "1.4"
5858
rstest = "0.26.1"
5959
rustls-pemfile = "2.2.0"
6060
rustyline = "15.0.0"
61-
sentry = { version = "0.37.0", default-features = false, features = ["anyhow", "backtrace", "contexts", "debug-images", "panic", "reqwest", "rustls"] }
6261
serde_bare = "0.5.0"
6362
serde_yaml = "0.9.34"
6463
sha2 = "0.10"
@@ -81,6 +80,11 @@ tracing-opentelemetry = "0.29"
8180
tracing-slog = "0.2"
8281
vergen = "9.0.4"
8382

83+
[workspace.dependencies.sentry]
84+
version = "0.37.0"
85+
default-features = false
86+
features = ["anyhow","backtrace","contexts","debug-images","panic","reqwest","rustls"]
87+
8488
[workspace.dependencies.windows]
8589
version = "0.58"
8690
features = ["Win32","Win32_Storage","Win32_Storage_FileSystem","Win32_System","Win32_System_Console","Win32_Security"]
@@ -379,9 +383,6 @@ path = "packages/services/pegboard"
379383
[workspace.dependencies.rivet-api-full]
380384
path = "sdks/rust/api-full"
381385

382-
[workspace.dependencies.rivet-api-runtime]
383-
path = "sdks/rust/api-runtime"
384-
385386
[workspace.dependencies.bare_gen]
386387
path = "sdks/rust/bare_gen"
387388

‎docker/engine/linux-x86_64.Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ RUN apt-get update && apt-get install -y \
1616
g++-multilib \
1717
git-lfs && \
1818
rm -rf /var/lib/apt/lists/* && \
19-
wget -q https://musl.cc/x86_64-linux-musl-cross.tgz && \
20-
tar -xzf x86_64-linux-musl-cross.tgz -C /opt/ && \
21-
rm x86_64-linux-musl-cross.tgz
19+
wget https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz && \
20+
tar -xJf x86_64-unknown-linux-musl.tar.xz -C /opt/ && \
21+
rm x86_64-unknown-linux-musl.tar.xz
2222

2323
# Install musl targets
2424
RUN rustup target add x86_64-unknown-linux-musl
2525

2626
# Set environment variables
27-
ENV PATH="/opt/x86_64-linux-musl-cross/bin:$PATH" \
27+
ENV PATH="/opt/x86_64-unknown-linux-musl/bin:$PATH" \
2828
LIBCLANG_PATH=/usr/lib/llvm-14/lib \
2929
CLANG_PATH=/usr/bin/clang-14 \
3030
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \

‎pnpm-lock.yaml‎

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

‎pnpm-workspace.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ packages:
22
- docker/template
33
- frontend
44
- scripts/tests
5+
- scripts/release
56
- sdks/typescript/api-full
6-
- sdks/typescript/api-runtime
77
- sdks/typescript/runner
88
- sdks/typescript/runner-protocol
99
- sdks/typescript/test-runner

0 commit comments

Comments
 (0)