commit d2fb12da002968e4c323816ab5be54ccf6cb63b9 parent 2e81339a7f8b8d034c1c9152a65ac8273d15e627 Author: Yersa Nordman <yersa@finwo.nl> Date: Sun, 8 Oct 2023 19:27:14 +0200 Another attempt at merging native and alpine builders Diffstat:
| M | .github/workflows/tag-assets.yml | | | 34 | +++++++++++++++++++++------------- |
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/tag-assets.yml b/.github/workflows/tag-assets.yml @@ -18,11 +18,11 @@ jobs: - os: ubuntu-latest arch: x86_64 target: linux-glibc-amd64 - shell: /usr/bin/bash -e {0} + mode: native - os: ubuntu-latest arch: x86_64 target: linux-musl-amd64 - shell: alpine.sh {0} + mode: alpine steps: - uses: actions/checkout@v3 - uses: finwo/dep@edge @@ -34,21 +34,29 @@ jobs: # TODO: run uraimo/run-on-arch-action@v2 for bash/glibc # TODO: run setup-alpine only for musl - - name: Install pandoc + - if: ${{ matrix.mode == 'native' }} + name: Install pandoc run: ./.github/install-pkg.sh pandoc - shell: ${{ matrix.shell }} - - name: Build generic package - run: make package TARGET=${{ matrix.target }} SVC=generic - shell: ${{ matrix.shell }} + - if: ${{ matrix.mode == 'alpine' }} + name: Install pandoc + shell: alpine.sh {0} + run: ./.github/install-pkg.sh pandoc - - name: Build openrc package - run: make package TARGET=${{ matrix.target }} SVC=openrc - shell: ${{ matrix.shell }} + - if: ${{ matrix.mode == 'native' }} + name: Build generic package + run: | + make package TARGET=${{ matrix.target }} SVC=generic + make package TARGET=${{ matrix.target }} SVC=openrc + make package TARGET=${{ matrix.target }} SVC=procd - - name: Build procd package - run: make package TARGET=${{ matrix.target }} SVC=procd - shell: ${{ matrix.shell }} + - if: ${{ matrix.mode == 'alpine' }} + name: Build generic package + shell: alpine.sh {0} + run: | + make package TARGET=${{ matrix.target }} SVC=generic + make package TARGET=${{ matrix.target }} SVC=openrc + make package TARGET=${{ matrix.target }} SVC=procd - name: Upload packages to release uses: svenstaro/upload-release-action@v2