From 5ccdbe52d4f17ac9ad1aec7f77c5deab60974bc9 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 8 Nov 2021 18:25:37 +0000 Subject: [PATCH] GitHub workflow fixes 1. Adds act support. https://github.com/nektos/act 2. Fixes OpenDingux workflows OpenDingux workflows tested with act: act -W .github/workflows/retrofw_release.yml -j retrofw --- .github/workflows/Android.yml | 7 ++++--- .github/workflows/Linux_x86.yml | 2 ++ .github/workflows/Linux_x86_64_SDL1.yml | 1 + .github/workflows/Windows_x64.yml | 1 + .github/workflows/Windows_x86.yml | 1 + .github/workflows/opendingux_release.yml | 16 +++++++++------- .github/workflows/retrofw_release.yml | 12 +++++++----- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml index b40760c2f..86c7a8b18 100644 --- a/.github/workflows/Android.yml +++ b/.github/workflows/Android.yml @@ -12,13 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Install gettext - run: sudo apt install -y gettext + run: sudo apt update && sudo apt install -y gettext - name: Checkout uses: actions/checkout@v2 with: fetch-depth: 0 - + - name: set up JDK 11 uses: actions/setup-java@v2 with: @@ -37,13 +37,14 @@ jobs: path: android-project/app/.cxx key: android-cmake-${{ github.sha }} restore-keys: android-cmake- - + - name: Build working-directory: ${{github.workspace}} shell: bash run: cd android-project && ./gradlew assembleDebug - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx-debug.apk diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml index b1e3efe15..774a69755 100644 --- a/.github/workflows/Linux_x86.yml +++ b/.github/workflows/Linux_x86.yml @@ -43,12 +43,14 @@ jobs: run: Packaging/nix/LinuxReleasePackaging.sh && Packaging/nix/AppImage.sh - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx_linux_x86.tar.xz path: devilutionx.tar.xz - name: Upload-AppImage + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx_linux_x86.appimage diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml index 56103800e..337a6980e 100644 --- a/.github/workflows/Linux_x86_64_SDL1.yml +++ b/.github/workflows/Linux_x86_64_SDL1.yml @@ -42,6 +42,7 @@ jobs: run: Packaging/nix/LinuxReleasePackaging.sh - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx_linux_x86_64_SDL1.tar.xz diff --git a/.github/workflows/Windows_x64.yml b/.github/workflows/Windows_x64.yml index bc11ed052..61f88c055 100644 --- a/.github/workflows/Windows_x64.yml +++ b/.github/workflows/Windows_x64.yml @@ -40,6 +40,7 @@ jobs: run: cmake --build build -j $(nproc) --target package - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx_x64.zip diff --git a/.github/workflows/Windows_x86.yml b/.github/workflows/Windows_x86.yml index 441d64fa8..1232cf76d 100644 --- a/.github/workflows/Windows_x86.yml +++ b/.github/workflows/Windows_x86.yml @@ -40,6 +40,7 @@ jobs: run: cmake --build build -j $(nproc) --target package - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx_x86.zip diff --git a/.github/workflows/opendingux_release.yml b/.github/workflows/opendingux_release.yml index 5dfe907ee..7e41748df 100644 --- a/.github/workflows/opendingux_release.yml +++ b/.github/workflows/opendingux_release.yml @@ -16,19 +16,20 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y curl git smpq && + sudo apt install -y curl cmake git smpq squashfs-tools && curl -L http://od.abstraction.se/opendingux/toolchain/opendingux-gcw0-toolchain.2021-03-10.tar.xz -o gcw0-toolchain.tar.xz && sudo mkdir -p /opt/gcw0-toolchain && sudo chown -R "${USER}:" /opt/gcw0-toolchain && - tar -C /opt -xvf gcw0-toolchain.tar.xz + tar -C /opt -xf gcw0-toolchain.tar.xz - name: Build working-directory: ${{github.workspace}} shell: bash run: Packaging/OpenDingux/build.sh rg350 env: - - TOOLCHAIN: /opt/gcw0-toolchain + TOOLCHAIN: /opt/gcw0-toolchain - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx-rg350.opk.zip @@ -45,19 +46,20 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y curl git smpq && - curl -L http://od.abstraction.se/opendingux/toolchain/opendingux-lepus-toolchain.2021-03-10.tar.xz -o lepus-toolchain.tar.xz && + sudo apt install -y curl cmake git smpq squashfs-tools && + curl -L http://od.abstraction.se/opendingux/toolchain/opendingux-lepus-toolchain.2021-03-11.tar.xz -o lepus-toolchain.tar.xz && sudo mkdir -p /opt/lepus-toolchain && sudo chown -R "${USER}:" /opt/lepus-toolchain && - tar -C /opt -xvf lepus-toolchain.tar.xz + tar -C /opt -xf lepus-toolchain.tar.xz - name: Build working-directory: ${{github.workspace}} shell: bash run: Packaging/OpenDingux/build.sh lepus env: - - TOOLCHAIN: /opt/lepus-toolchain + TOOLCHAIN: /opt/lepus-toolchain - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx-lepus.opk.zip diff --git a/.github/workflows/retrofw_release.yml b/.github/workflows/retrofw_release.yml index 8318c2eaf..d326332b8 100644 --- a/.github/workflows/retrofw_release.yml +++ b/.github/workflows/retrofw_release.yml @@ -16,19 +16,21 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y curl git smpq && - curl -L https://github.com/retrofw/buildroot/releases/download/2018.02.11/mipsel-linux-uclibc_x64.tar.gz -o retrofw-toolchain.tar.xz && - sudo mkdir -p /opt/mipsel-linux-uclibc && sudo chown -R "${USER}:" /opt/mipsel-linux-uclibc && - tar -C /opt -xvf retrofw-toolchain.tar.xz + sudo apt install -y curl cmake git smpq squashfs-tools gettext && + curl -L https://github.com/Poligraf/retrofw_buildroot_gcc11/releases/download/2.3.2/host.tar.gz -o retrofw-toolchain.tar.gz && + sudo mkdir -p /opt/retrofw-toolchain && sudo chown -R "${USER}:" /opt/retrofw-toolchain && + tar -C /opt/retrofw-toolchain --strip-components=1 -xf retrofw-toolchain.tar.gz && + cd /opt/retrofw-toolchain && ./relocate-sdk.sh - name: Build working-directory: ${{github.workspace}} shell: bash run: Packaging/OpenDingux/build.sh retrofw env: - - TOOLCHAIN: /opt/mipsel-linux-uclibc + TOOLCHAIN: /opt/retrofw-toolchain - name: Upload-Package + if: ${{ !env.ACT }} uses: actions/upload-artifact@v2 with: name: devilutionx-retrofw.opk.zip