diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 9b2f633..d495608 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -8,7 +8,7 @@ on: type: string jobs: pkg: - name: Build {{ inputs.package }}-${{ inputs.version }} + name: Build {{ inputs.package }} runs-on: ${{ matrix.os }} container: ${{ matrix.container }} strategy: @@ -39,13 +39,16 @@ jobs: - name: Init Hermit run: ./bin/hermit env --raw >> $GITHUB_ENV - name: Build + id: build run: | if [ -f /opt/rh/devtoolset-11/enable ]; then . /opt/rh/devtoolset-11/enable; fi - make VERSION=${{ inputs.version }} -C pkgs/${{ inputs.package }} + make -C pkgs/${{ inputs.package }} + # Output version for release action + echo "version=$(make -C pkgs/${{ inputs.package }} version)" >> $GITHUB_ENV - name: Upload Release uses: ncipollo/release-action@v1 with: - tag: ${{ inputs.package }}-${{ inputs.version }} + tag: ${{ inputs.package }}-${{ steps.build.outputs.version }} allowUpdates: true - artifacts: "pkgs/${{ inputs.package }}/${{ inputs.package }}-${{ inputs.version }}-*.tar.xz" + artifacts: "pkgs/${{ inputs.package }}/${{ inputs.package }}-${{ steps.build.outputs.version }}-*.tar.xz" token: ${{ secrets.GITHUB_TOKEN }} diff --git a/pkgs/build.mk b/pkgs/build.mk index 5ee64bf..9fddfc8 100644 --- a/pkgs/build.mk +++ b/pkgs/build.mk @@ -36,7 +36,7 @@ clean: $(OUTPUT): pkg.tar.gz $(MAKE) clean deps mkdir build dist - tar -C build --strip-components 1 -xf pkg.tar.gz + tar -C build --strip-components 1 -xf pkg.tar.gz sandbox $(MAKE) -C build -f ../Makefile configure sandbox $(MAKE) -C build -f ../Makefile build sandbox $(MAKE) -C build -f ../Makefile install @@ -48,3 +48,6 @@ $(DEPS): pkg.tar.gz: curl -fsSL $(SOURCE) -o pkg.tar.gz + +version: + @echo $(VERSION) \ No newline at end of file