From 3321cd2bc780f58bbc3d38b711ed6c4b65b90d3d Mon Sep 17 00:00:00 2001 From: Talo Halton Date: Thu, 16 May 2024 12:53:54 +0100 Subject: [PATCH] Update workflows --- .github/workflows/build-linux-arm64.yml | 23 ++++++++++++++++- .github/workflows/build-linux-x86_64.yml | 23 ++++++++++++++++- .github/workflows/build-windows-x86_64.yml | 29 +++++++++++++++++----- 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index 0d9a9e9..d78c161 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -5,12 +5,14 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] + types: [opened, synchronize, reopened, ready_for_review] workflow_dispatch: jobs: build-spms: runs-on: ubuntu-22.04 container: ubuntu:23.04 + if: ${{ github.event.pull_request.draft == false && (github.event_name == 'workflow_dispatch' || !contains(github.event.head_commit.message, 'noci')) }} env: TOOLCHAIN_VERSION: aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 @@ -125,7 +127,7 @@ jobs: run: chmod +x gradle - name: Build linux-arm64 binaries - run: ./gradlew linux-arm64Binaries -PlinkStatic + run: ./gradlew linux-arm64Binaries -PLINK_STATIC - name: Strip release binary run: $TOOLCHAIN/bin/aarch64-unknown-linux-gnu-strip build/bin/linux-arm64/releaseExecutable/*.kexe @@ -141,3 +143,22 @@ jobs: with: name: spms-linux-arm64-release path: build/bin/linux-arm64/releaseExecutable/*.kexe + + - name: Build linux-arm64 binaries without mpv + run: ./gradlew linux-arm64Binaries -PLINK_STATIC -PDISABLE_MPV + + - name: Strip release binary + run: $TOOLCHAIN/bin/aarch64-unknown-linux-gnu-strip build/bin/linux-arm64/releaseExecutable/*.kexe + + - name: Upload debug binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-linux-arm64-debug + path: build/bin/linux-arm64/debugExecutable/*.kexe + + - name: Upload release binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-linux-arm64-release + path: build/bin/linux-arm64/releaseExecutable/*.kexe + diff --git a/.github/workflows/build-linux-x86_64.yml b/.github/workflows/build-linux-x86_64.yml index 44110f9..f61d6d2 100644 --- a/.github/workflows/build-linux-x86_64.yml +++ b/.github/workflows/build-linux-x86_64.yml @@ -5,12 +5,14 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] + types: [opened, synchronize, reopened, ready_for_review] workflow_dispatch: jobs: build-spms: runs-on: ubuntu-22.04 container: ubuntu:23.04 + if: ${{ github.event.pull_request.draft == false && (github.event_name == 'workflow_dispatch' || !contains(github.event.head_commit.message, 'noci')) }} env: TOOLCHAIN_VERSION: x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 @@ -88,7 +90,7 @@ jobs: run: chmod +x gradle - name: Build linux-x86_64 binaries - run: ./gradlew linux-x86_64Binaries -PlinkStatic + run: ./gradlew linux-x86_64Binaries -PLINK_STATIC - name: Strip release binary run: $TOOLCHAIN/bin/x86_64-unknown-linux-gnu-strip build/bin/linux-x86_64/releaseExecutable/*.kexe @@ -104,3 +106,22 @@ jobs: with: name: spms-linux-x86_64-release path: build/bin/linux-x86_64/releaseExecutable/*.kexe + + - name: Build linux-x86_64 binaries without mpv + run: ./gradlew linux-x86_64Binaries -PLINK_STATIC -PDISABLE_MPV + + - name: Strip release binary + run: $TOOLCHAIN/bin/x86_64-unknown-linux-gnu-strip build/bin/linux-x86_64/releaseExecutable/*.kexe + + - name: Upload debug binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-linux-x86_64-debug + path: build/bin/linux-x86_64/debugExecutable/*.kexe + + - name: Upload release binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-linux-x86_64-release + path: build/bin/linux-x86_64/releaseExecutable/*.kexe + diff --git a/.github/workflows/build-windows-x86_64.yml b/.github/workflows/build-windows-x86_64.yml index 6574ffe..aecec8f 100644 --- a/.github/workflows/build-windows-x86_64.yml +++ b/.github/workflows/build-windows-x86_64.yml @@ -5,11 +5,13 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] + types: [opened, synchronize, reopened, ready_for_review] workflow_dispatch: jobs: build: runs-on: windows-latest + if: ${{ github.event.pull_request.draft == false && (github.event_name == 'workflow_dispatch' || !contains(github.event.head_commit.message, 'noci')) }} steps: - uses: actions/checkout@v3 @@ -51,7 +53,7 @@ jobs: uses: gradle/gradle-build-action@v3 - name: Build windows-x86_64 binaries - run: .\gradlew.bat windows-x86_64Binaries -PlinkStatic + run: .\gradlew.bat windows-x86_64Binaries -PLINK_STATIC - name: Upload debug binary uses: actions/upload-artifact@v3 @@ -65,8 +67,23 @@ jobs: name: spms-windows-x86_64-release path: build\bin\windows-x86_64\releaseExecutable\*.exe - # - name: Upload DLL dependencies - # uses: actions/upload-artifact@v3 - # with: - # name: dependencies - # path: build\bin\windows-x86_64\releaseExecutable\*.dll + - name: Build windows-x86_64 binaries without mpv + run: .\gradlew.bat windows-x86_64Binaries -PLINK_STATIC -PDISABLE_MPV + + - name: Upload debug binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-windows-x86_64-debug + path: build\bin\windows-x86_64\debugExecutable\*.exe + + - name: Upload release binary + uses: actions/upload-artifact@v3 + with: + name: spms-nompv-windows-x86_64-release + path: build\bin\windows-x86_64\releaseExecutable\*.exe + + - name: Upload DLL dependencies + uses: actions/upload-artifact@v3 + with: + name: dependencies + path: build\bin\windows-x86_64\releaseExecutable\*.dll