Skip to content

Commit ed56475

Browse files
authored
fix: increase release ci runner size (#2941)
* fix: increase release ci runner size * chore: release 25.7.0 Release-As: 25.7.0 * chore(release): update version to 25.7.1
1 parent 4341f0f commit ed56475

File tree

7 files changed

+22
-25
lines changed

7 files changed

+22
-25
lines changed

.github/workflows/release.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@ jobs:
7979
matrix:
8080
include:
8181
- platform: linux
82-
runner: depot-ubuntu-24.04
82+
runner: depot-ubuntu-24.04-4
8383
target: x86_64-unknown-linux-musl
8484
binary_ext: ""
8585
arch: x86_64
8686
- platform: windows
87-
runner: depot-ubuntu-24.04
87+
runner: depot-ubuntu-24.04-4
8888
target: x86_64-pc-windows-gnu
8989
binary_ext: ".exe"
9090
arch: x86_64
9191
- platform: macos
92-
runner: depot-ubuntu-24.04
92+
runner: depot-ubuntu-24.04-4
9393
target: x86_64-apple-darwin
9494
binary_ext: ""
9595
arch: x86_64
9696
- platform: macos
97-
runner: depot-ubuntu-24.04
97+
runner: depot-ubuntu-24.04-4
9898
target: aarch64-apple-darwin
9999
binary_ext: ""
100100
arch: aarch64
@@ -155,10 +155,10 @@ jobs:
155155
include:
156156
# TODO(RVT-4479): Add back ARM builder once manifest generation fixed
157157
# - platform: linux/arm64
158-
# runner: depot-ubuntu-24.04
158+
# runner: depot-ubuntu-24.04-4
159159
# arch_suffix: -arm64
160160
- platform: linux/x86_64
161-
runner: depot-ubuntu-24.04
161+
runner: depot-ubuntu-24.04-4
162162
# TODO: Replace with appropriate arch_suffix when needed
163163
# arch_suffix: -amd64
164164
arch_suffix: ''
@@ -193,6 +193,7 @@ jobs:
193193
platforms: ${{ matrix.platform }}
194194
build-args: |
195195
BUILD_FRONTEND=true
196+
CARGO_BUILD_MODE=release
196197
# secrets: |
197198
# fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
198199
# secret-files: |
@@ -209,6 +210,7 @@ jobs:
209210
platforms: ${{ matrix.platform }}
210211
build-args: |
211212
BUILD_FRONTEND=true
213+
CARGO_BUILD_MODE=release
212214
# secrets: |
213215
# fontawesome_package_token=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
214216
# secret-files: |

docker/engine/linux-aarch64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.88.0 AS base
33

44
ARG BUILD_FRONTEND=true
5-
ARG VITE_APP_API_URL
5+
ARG VITE_APP_API_URL=__SAME__
66

77
# Install dependencies
88
RUN apt-get update && apt-get install -y \

docker/engine/linux-x86_64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.88.0 AS base
33

44
ARG BUILD_FRONTEND=true
5-
ARG VITE_APP_API_URL
5+
ARG VITE_APP_API_URL=__SAME__
66

77
# Install dependencies
88
RUN apt-get update && apt-get install -y \

docker/engine/macos-aarch64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.88.0 AS base
33

44
ARG BUILD_FRONTEND=true
5-
ARG VITE_APP_API_URL
5+
ARG VITE_APP_API_URL=__SAME__
66

77
# Install dependencies
88
RUN apt-get update && apt-get install -y \

docker/engine/macos-x86_64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.88.0 AS base
33

44
ARG BUILD_FRONTEND=true
5-
ARG VITE_APP_API_URL
5+
ARG VITE_APP_API_URL=__SAME__
66

77
# Install dependencies
88
RUN apt-get update && apt-get install -y \

docker/engine/windows.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM rust:1.88.0
33

44
ARG BUILD_FRONTEND=true
5-
ARG VITE_APP_API_URL
5+
ARG VITE_APP_API_URL=__SAME__
66

77
# Install dependencies
88
RUN apt-get update && apt-get install -y \

docker/universal/Dockerfile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ FROM --platform=linux/amd64 rust:1.88.0-bookworm AS builder
88
ARG TARGETARCH
99

1010
ARG BUILD_FRONTEND=false
11-
ARG VITE_APP_API_URL
11+
ARG CARGO_BUILD_MODE=debug
12+
ARG VITE_APP_API_URL=__SAME__
1213

1314
ENV DEBIAN_FRONTEND=noninteractive
1415
RUN apt-get update -y && \
@@ -65,10 +66,14 @@ RUN \
6566
--mount=type=cache,target=/usr/local/cargo/registry,id=univseral-cargo-registry \
6667
--mount=type=cache,target=/app/target,id=univseral-target \
6768
--mount=type=cache,target=/root/.cache,id=universal-user-cache \
68-
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet-engine && \
69+
if [ "$CARGO_BUILD_MODE" = "release" ]; then \
70+
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet-engine --release; \
71+
else \
72+
RUSTFLAGS="--cfg tokio_unstable" cargo build --bin rivet-engine; \
73+
fi && \
6974
# cargo install --locked tokio-console && \
7075
mkdir /app/dist/ && \
71-
cp target/debug/rivet-engine /app/dist/
76+
cp target/$CARGO_BUILD_MODE/rivet-engine /app/dist/
7277

7378
# MARK: Engine (full, base)
7479
FROM --platform=linux/amd64 debian:12.9-slim AS engine-full-base
@@ -78,23 +83,13 @@ ARG TARGETARCH
7883

7984
ENV DEBIAN_FRONTEND=noninteractive
8085
# - Install curl for health checks
81-
# - Install go-migrate for running migrations
82-
# - Install database clients to be able to run `rivet db shell ...` (Redis, Postgres, ClickHouse)
8386
RUN apt-get update -y && \
8487
apt-get install -y \
8588
ca-certificates \
8689
openssl \
8790
curl \
88-
# redis-tools \
89-
# postgresql-client \
9091
gpg \
9192
dirmngr && \
92-
# curl -fsSL 'https://packages.clickhouse.com/rpm/lts/repodata/repomd.xml.key' | gpg --dearmor -o /usr/share/keyrings/clickhouse-keyring.gpg && \
93-
# echo "deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb stable main" | tee /etc/apt/sources.list.d/clickhouse.list && \
94-
# apt-get update -y && \
95-
# apt-get install -y clickhouse-client && \
96-
# (curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.1/migrate.linux-amd64.tar.gz | tar xvz) && \
97-
# mv migrate /usr/local/bin/migrate && \
9893
apt-get clean && \
9994
rm -rf /var/lib/apt/lists/* && \
10095
if [ "$TARGETARCH" = "arm64" ]; then \
@@ -106,7 +101,7 @@ RUN apt-get update -y && \
106101
# MARK: Engine (Full)
107102
FROM --platform=linux/amd64 engine-full-base AS engine-full
108103

109-
LABEL org.opencontainers.image.source https://github.com/rivet-gg/rivet
104+
LABEL org.opencontainers.image.source=https://github.com/rivet-gg/rivet
110105

111106
COPY --from=builder /app/dist/rivet-engine /usr/bin/rivet-engine
112107

0 commit comments

Comments
 (0)