diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index 33370981..2f9897eb 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -29,14 +29,11 @@ jobs: platform: - linux/amd64 - linux/arm64 - - linux/arm/v7 include: - platform: linux/amd64 target: x86_64-unknown-linux-musl - platform: linux/arm64 target: aarch64-unknown-linux-musl - - platform: linux/arm/v7 - target: armv7-unknown-linux-musleabihf steps: - name: Checkout repository @@ -78,19 +75,21 @@ jobs: platforms: ${{ matrix.platform }} file: ./Dockerfile.build labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }} + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=${{ github.event_name != 'pull_request' }},name-canonical=true,push=${{ github.event_name != 'pull_request' }} cache-from: type=gha cache-to: type=gha,mode=max build-args: | TARGET=${{ matrix.target }} - name: Export digest + if: github.event_name != 'pull_request' run: | mkdir -p /tmp/digests digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload digest + if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: name: digests-${{ matrix.target }} diff --git a/Cargo.toml b/Cargo.toml index 44641f05..f32b20dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ authors = [ "spikecodes <19519553+spikecodes@users.noreply.github.com>", ] edition = "2021" -rust-version = "1.81" +rust-version = "1.83" default-run = "redlib" [dependencies] diff --git a/Dockerfile.build b/Dockerfile.build index f9279500..a620774a 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,5 +1,5 @@ # Build stage -FROM rust:1.81-alpine AS builder +FROM rust:1.83-alpine AS builder ARG TARGET