Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #123

Merged
merged 11 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 6 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
name: Build

on:
pull_request:
branches: [ "main" ]
push:
branches: [ "main" ]

jobs:
frontend:
name: Build frontend assets
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
- run: rustup toolchain install stable --profile minimal
- run: rustup target add wasm32-unknown-unknown
- uses: jetli/trunk-action@v0.4.0
- uses: jetli/trunk-action@v0.5.0
with:
version: 'v0.16.0'
version: 'latest'

- uses: actions/cache@v4
with:
Expand All @@ -40,7 +42,7 @@ jobs:
build:
name: Binaries for ${{ matrix.name }}
needs: frontend
runs-on: ${{ matrix.os }}
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -52,34 +54,24 @@ jobs:
- linux-arm64-musl
include:
- name: linux-x86-64-gnu
os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
platform: ~
cross: false

- name: linux-armv7-gnu
os: ubuntu-20.04
target: armv7-unknown-linux-gnueabihf
platform: ~
cross: true

- name: linux-arm64-gnu
os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
platform: ~
cross: true

- name: linux-x86-64-musl
os: ubuntu-20.04
target: x86_64-unknown-linux-musl
platform: amd64
cross: true

- name: linux-arm64-musl
os: ubuntu-20.04
target: aarch64-unknown-linux-musl
platform: arm64
cross: true

steps:
- uses: actions/checkout@v4
Expand All @@ -103,10 +95,5 @@ jobs:

- run: cargo install cross --git https://github.com/cross-rs/cross || true

- name: Build
if: ${{ !matrix.cross }}
run: cargo build --release --locked --target ${{ matrix.target }} --manifest-path backend/Cargo.toml

- name: Cross build
if: ${{ matrix.cross }}
run: cross build --release --locked --target ${{ matrix.target }} --manifest-path backend/Cargo.toml
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: rustup toolchain install stable --profile minimal
Expand Down
27 changes: 6 additions & 21 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
prepare:
name: Prepare release
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Release
Expand All @@ -24,15 +24,15 @@ jobs:

frontend:
name: Build frontend assets
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
- run: rustup toolchain install stable --profile minimal
- run: rustup target add wasm32-unknown-unknown
- uses: jetli/trunk-action@v0.4.0
- uses: jetli/trunk-action@v0.5.0
with:
version: 'v0.16.0'
version: 'latest'

- uses: actions/cache/restore@v4
with:
Expand All @@ -57,7 +57,7 @@ jobs:
build:
name: Binaries for ${{ matrix.name }}
needs: frontend
runs-on: ${{ matrix.os }}
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -69,34 +69,24 @@ jobs:
- linux-arm64-musl
include:
- name: linux-x86-64-gnu
os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
platform: ~
cross: false

- name: linux-armv7-gnu
os: ubuntu-20.04
target: armv7-unknown-linux-gnueabihf
platform: ~
cross: true

- name: linux-arm64-gnu
os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
platform: ~
cross: true

- name: linux-x86-64-musl
os: ubuntu-20.04
target: x86_64-unknown-linux-musl
platform: amd64
cross: true

- name: linux-arm64-musl
os: ubuntu-20.04
target: aarch64-unknown-linux-musl
platform: arm64
cross: true

steps:
- uses: actions/checkout@v4
Expand All @@ -120,12 +110,7 @@ jobs:

- run: cargo install cross --git https://github.com/cross-rs/cross || true

- name: Build
if: ${{ !matrix.cross }}
run: cargo build --release --locked --target ${{ matrix.target }} --manifest-path backend/Cargo.toml

- name: Cross build
if: ${{ matrix.cross }}
run: cross build --release --locked --target ${{ matrix.target }} --manifest-path backend/Cargo.toml

- name: Copy binaries
Expand Down Expand Up @@ -159,7 +144,7 @@ jobs:
release:
name: Release
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16
FROM alpine:3.20
ARG TARGETARCH
ENV HTTP_HOST="0.0.0.0"
WORKDIR /app
Expand Down
Loading