diff --git a/.github/workflows/package-release.yml b/.github/workflows/package-release.yml index 1c0e350..d869ee3 100644 --- a/.github/workflows/package-release.yml +++ b/.github/workflows/package-release.yml @@ -13,18 +13,30 @@ jobs: fail-fast: false matrix: include: - - name: linux-amd64 + - name: linux-amd64-sdl3 runner: ubuntu-24.04 platform: linux arch: amd64 - - name: linux-arm64 + sdl_version: SDL3 + - name: linux-arm64-sdl3 runner: ubuntu-24.04-arm64 platform: linux arch: arm64 + sdl_version: SDL3 + - name: linux-amd64-sdl + runner: ubuntu-24.04 + platform: linux + arch: amd64 + sdl_version: sdl + - name: linux-arm64-sdl + runner: ubuntu-24.04-arm64 + platform: linux + arch: arm64 + sdl_version: sdl runs-on: ${{ matrix.runner }} env: - BUILD_DIR: build/${{ matrix.platform }}-${{ matrix.arch }} - ZIP_NAME: sdl3_app-${{ matrix.platform }}-${{ matrix.arch }}.zip + BUILD_DIR: build/${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.sdl_version }} + ZIP_NAME: sdl3_app-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.sdl_version }}.zip PLATFORM_NAME: ${{ matrix.platform }} steps: - name: Checkout @@ -33,7 +45,7 @@ jobs: - name: Download build artifact uses: actions/download-artifact@v4 with: - name: build-${{ matrix.platform }}-${{ matrix.arch }} + name: build-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.sdl_version }} path: . - name: Set up Python diff --git a/.github/workflows/upload-build-artifact.yml b/.github/workflows/upload-build-artifact.yml index 1ee901c..988e20e 100644 --- a/.github/workflows/upload-build-artifact.yml +++ b/.github/workflows/upload-build-artifact.yml @@ -12,15 +12,25 @@ jobs: fail-fast: false matrix: include: - - name: linux-amd64 + - name: linux-amd64-sdl3 platform: linux arch: amd64 - - name: linux-arm64 + sdl_version: SDL3 + - name: linux-arm64-sdl3 platform: linux arch: arm64 + sdl_version: SDL3 + - name: linux-amd64-sdl + platform: linux + arch: amd64 + sdl_version: sdl + - name: linux-arm64-sdl + platform: linux + arch: arm64 + sdl_version: sdl runs-on: ubuntu-24.04 env: - BUILD_DIR: build/${{ matrix.platform }}-${{ matrix.arch }} + BUILD_DIR: build/${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.sdl_version }} steps: - name: Checkout uses: actions/checkout@v4 @@ -49,20 +59,22 @@ jobs: if: matrix.platform == 'linux' env: BUILD_DIR: ${{ env.BUILD_DIR }} + SDL_VERSION: ${{ matrix.sdl_version }} run: | docker run --rm \ -e BUILD_DIR \ + -e SDL_VERSION \ -w /workspace \ -v "${{ github.workspace }}:/workspace" \ sdl3_app:${{ matrix.platform }}-${{ matrix.arch }} \ bash -c 'set -euo pipefail if [ -d "$BUILD_DIR" ]; then rm -rf "$BUILD_DIR"; fi cp -a /conan_build "$BUILD_DIR" - cmake -S . -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release + cmake -S . -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSDL_VERSION="$SDL_VERSION" cmake --build "$BUILD_DIR" --config Release' - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: build-${{ matrix.platform }}-${{ matrix.arch }} + name: build-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.sdl_version }} path: ${{ env.BUILD_DIR }}