diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a908aa..8375135 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: - "**" jobs: - build-windows: + build: strategy: fail-fast: false matrix: @@ -15,38 +15,6 @@ jobs: - name: Windows os: windows-latest - name: ${{ matrix.config.name }} - runs-on: ${{ matrix.config.os }} - - steps: - - uses: actions/checkout@v4 - - - name: Install OpenSSL - run: | - echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - vcpkg install openssl:x86-windows - - - name: Checkout Pro - uses: actions/checkout@v4 - with: - repository: HJfod/BetterEditPro - path: pro - token: ${{ secrets.ACCESS_TOKEN }} - ref: v6 - - - name: Build the mod - uses: geode-sdk/build-geode-mod@main - with: - bindings: geode-sdk/bindings - bindings-ref: main - combine: true - target: ${{ matrix.config.target }} - - build-android: - strategy: - fail-fast: false - matrix: - config: - name: Android32 os: ubuntu-latest target: Android32 @@ -54,17 +22,23 @@ jobs: - name: Android64 os: ubuntu-latest target: Android64 - + name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} steps: - uses: actions/checkout@v4 - - name: Install OpenSSL + - name: Install OpenSSL (Windows) + if: ${{ matrix.config.os == 'Windows' }} + run: | + vcpkg install openssl:x86-windows + + - name: Install OpenSSL (Android) + if: ${{ matrix.config.os == 'ubuntu-latest' }} run: | sudo apt-get install libssl-dev - sudo apt install pkg-config + sudo apt-get install pkg-config - name: Checkout Pro uses: actions/checkout@v4 @@ -81,11 +55,11 @@ jobs: bindings-ref: main combine: true target: ${{ matrix.config.target }} - + package: name: Package builds runs-on: ubuntu-latest - needs: ['build-windows', 'build-android'] + needs: ['build'] steps: - uses: geode-sdk/build-geode-mod/combine@main