diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7ddc557c..6f428a794 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,6 +103,11 @@ jobs: uses: actions/checkout@v4 - name: Fetch all git tags run: git fetch --prune --unshallow --tags + - name: Set Version + if: ${{ env.VERSION == '' }} + run: | + export VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')-dev + echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Download MassaStation Package uses: actions/download-artifact@v3 with: @@ -117,16 +122,11 @@ jobs: run: sh macos/create_pkg.sh ${{ matrix.arch }} "${{ vars.APPLE_DEVELOPER_ID}}" env: VERSION: ${{ env.VERSION }} - - name: Set Version - if: ${{ env.VERSION == '' }} - run: | - export VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')-dev - echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Notarise installer run: | ls - xcrun notarytool submit installer/massastation_${{ env.VERSION }}_${{ matrix.arch }}.pkg --wait --apple-id ${{ secrets.APPLE_ID }} --password ${{ secrets.APPLE_APP_PASSWORD }} --team-id ${{ secrets.APPLE_TEAM_ID }} - xcrun stapler staple installer/massastation_${{ env.VERSION }}_${{ matrix.arch }}.pkg + xcrun notarytool submit massastation_${{ env.VERSION }}_${{ matrix.arch }}.pkg --wait --apple-id ${{ secrets.APPLE_ID }} --password ${{ secrets.APPLE_APP_PASSWORD }} --team-id ${{ secrets.APPLE_TEAM_ID }} + xcrun stapler staple massastation_${{ env.VERSION }}_${{ matrix.arch }}.pkg - name: Upload Package uses: actions/upload-artifact@v3 with: