From d7adcdad72d4abc829c38293a93b047d9c33d43d Mon Sep 17 00:00:00 2001 From: Will Toohey Date: Sun, 26 Apr 2026 12:27:25 +1000 Subject: [PATCH] Fixup actions build --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/release.yml | 2 +- docker/Dockerfile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e369cd3..7419e97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,19 +2,19 @@ name: Build on: push: - branches: [master] - tags: ['*'] pull_request: jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - - uses: docker/setup-buildx-action@v3 + - uses: docker/setup-buildx-action@v4 - - uses: docker/build-push-action@v6 + - uses: docker/build-push-action@v7 + env: + DOCKER_BUILD_SUMMARY: false with: context: docker load: true @@ -28,7 +28,7 @@ jobs: - name: Test run: docker run --rm -v "$PWD:/work" layeredfs/deps bash test.sh - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: dist - path: dist/ + path: dist/*.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41de17b..3ed869d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: gh run watch "$run_id" -R "$GITHUB_REPOSITORY" --exit-status echo "run_id=$run_id" >> "$GITHUB_OUTPUT" - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: dist path: dist diff --git a/docker/Dockerfile b/docker/Dockerfile index 4fc1c42..94bd1d7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,7 @@ RUN set -eux; \ dpkg --add-architecture i386; \ apt-get update -qq; \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ - meson jq python3-pefile python3-requests wine wine32 wine64; \ + meson jq python3-pefile python3-requests wine wine32 wine64 xz-utils; \ apt-get clean -y; \ rm -rf /var/lib/apt/lists/*; @@ -15,10 +15,10 @@ RUN wine wineboot --init RUN set -eux; \ curl -fsSL "https://api.github.com/repos/mon/windows-dll-compat-checker/releases/latest" \ | jq -r '.assets[] | select(.name | contains("linux-x86_64")) | .browser_download_url' \ - | xargs curl -fsSL -o /tmp/dll_compat_checker.zip; \ - unzip /tmp/dll_compat_checker.zip -d /usr/local/bin/; \ + | xargs curl -fsSL -o /tmp/dll_compat_checker.tar.xz; \ + tar -xJf /tmp/dll_compat_checker.tar.xz -C /usr/local/bin/; \ chmod +x /usr/local/bin/windows_dll_compat_checker; \ - rm /tmp/dll_compat_checker.zip; + rm /tmp/dll_compat_checker.tar.xz; ENV CROSS_32=/opt/llvm-mingw/toolchain-files/meson/i686-mingw32-clang.ini ENV CROSS_64=/opt/llvm-mingw/toolchain-files/meson/x86_64-mingw32-clang.ini