From 5974c1fba644007351dc6d7ab35a5479321bb154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Barto=C5=88?= Date: Mon, 8 Jul 2024 23:50:00 +0200 Subject: [PATCH] Add build of `mingw-w64-cross-zlib` to `main.yml` and `build.sh` (#13) --- .github/scripts/build-package.sh | 3 ++- .github/workflows/main.yml | 29 ++++++++++++++++++++++++++--- build.sh | 6 ++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/scripts/build-package.sh b/.github/scripts/build-package.sh index 991cdb5..2e49e9e 100755 --- a/.github/scripts/build-package.sh +++ b/.github/scripts/build-package.sh @@ -15,6 +15,7 @@ ARGUMENTS="--syncdeps \ --noconfirm \ --noprogressbar \ --nocheck \ + --skippgpcheck \ --force \ $([ "$NO_EXTRACT" = 1 ] && echo "--noextract" || echo "") \ $([ "$CLEAN_BUILD" = 1 ] && echo "--cleanbuild" || echo "") \ @@ -23,7 +24,7 @@ ARGUMENTS="--syncdeps \ ccache -svv || true if [[ "$PACKAGE_REPOSITORY" == *MINGW* ]]; then - makepkg-mingw $ARGUMENTS --skippgpcheck + makepkg-mingw $ARGUMENTS else makepkg $ARGUMENTS fi diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 420cbaf..f3295b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,7 +53,7 @@ jobs: [ mingw-w64-cross-headers, mingw-w64-cross-binutils, - mingw-w64-cross-gcc-stage1, + mingw-w64-cross-gcc-stage1 ] uses: ./.github/workflows/build-package.yml with: @@ -69,7 +69,7 @@ jobs: mingw-w64-cross-headers, mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1, - mingw-w64-cross-crt, + mingw-w64-cross-crt ] uses: ./.github/workflows/build-package.yml with: @@ -86,7 +86,7 @@ jobs: mingw-w64-cross-gcc-stage1, mingw-w64-cross-windows-default-manifest, mingw-w64-cross-crt, - mingw-w64-cross-winpthreads, + mingw-w64-cross-winpthreads ] uses: ./.github/workflows/build-package.yml with: @@ -95,6 +95,23 @@ jobs: packages_repository: Windows-on-ARM-Experiments/MSYS2-packages packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} + mingw-w64-cross-zlib: + needs: [ + mingw-w64-cross-headers, + mingw-w64-cross-binutils, + mingw-w64-cross-windows-default-manifest, + mingw-w64-cross-crt, + mingw-w64-cross-winpthreads, + mingw-w64-cross-gcc + ] + + uses: ./.github/workflows/build-package.yml + with: + package_name: mingw-w64-cross-zlib + needs: ${{ toJson(needs) }} + packages_repository: Windows-on-ARM-Experiments/MSYS2-packages + packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} + repository: needs: [ @@ -105,6 +122,7 @@ jobs: mingw-w64-cross-crt, mingw-w64-cross-winpthreads, mingw-w64-cross-gcc, + mingw-w64-cross-zlib ] runs-on: windows-latest @@ -153,6 +171,11 @@ jobs: with: name: mingw-w64-cross-gcc + - name: Download mingw-w64-cross-zlib + uses: actions/download-artifact@v4 + with: + name: mingw-w64-cross-zlib + - name: Setup MSYS2 packages repository run: | mkdir aarch64 diff --git a/build.sh b/build.sh index 15697cf..055c908 100644 --- a/build.sh +++ b/build.sh @@ -65,3 +65,9 @@ echo "::group::Build mingw-w64-cross-gcc" pacman -U --noconfirm *.pkg.tar.zst popd echo "::endgroup::" + +echo "::group::Build mingw-w64-cross-zlib" + pushd ../MSYS2-packages/mingw-w64-cross-zlib + makepkg $MAKEPKG_OPTIONS --skippgpcheck + popd +echo "::endgroup::"