From e7f5500c84bf001fb8c5db63a21e5b75e65323e4 Mon Sep 17 00:00:00 2001 From: Michael Herger Date: Wed, 4 Sep 2024 17:26:34 +0200 Subject: [PATCH] Need to bump the macOS build host version, Docker image, and some actions. --- .github/workflows/build-spotty.yml | 20 ++++++++++---------- docker/Dockerfile | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-spotty.yml b/.github/workflows/build-spotty.yml index 2f2b62160..f5dcf31c0 100644 --- a/.github/workflows/build-spotty.yml +++ b/.github/workflows/build-spotty.yml @@ -11,7 +11,7 @@ env: jobs: macOS: - runs-on: macos-11.0 + runs-on: macos-12 steps: - name: Install Rust @@ -20,10 +20,10 @@ jobs: toolchain: stable - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }} @@ -51,7 +51,7 @@ jobs: -output releases/spotty - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: spotty-mac path: releases/ @@ -61,10 +61,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }} @@ -79,7 +79,7 @@ jobs: docker run --rm -v $PWD/target:/build -v $PWD:/src spotty-cross - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: spotty-linux path: releases/ @@ -89,10 +89,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Write Build Configuration File - uses: DamianReeves/write-file-action@v1.0 + uses: DamianReeves/write-file-action@v1.3 with: path: ./src/client_id.txt contents: ${{ env.KEYMASTER_CLIENT_ID }} @@ -102,7 +102,7 @@ jobs: run: cargo build --release - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: spotty.exe path: target/release/spotty.exe \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 73c02ff8a..3500aa656 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # Cross compilation environment for spotty -FROM debian:stretch +FROM debian:buster RUN dpkg --add-architecture arm64 && \ dpkg --add-architecture armhf && \