diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index 332977e5f..6db3e956b 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -14,6 +14,11 @@ else TAG=$VERSION fi +# include platform on mac in version string +if [ "$(uname -s)" = Darwin ]; then + VERSION="$(uname -m)-$VERSION" +fi + if [ -z "${CHANNEL-}" ]; then CHANNEL=$VERSION fi diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 136429ac5..db8b9fb1c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -225,12 +225,12 @@ jobs: if: (github.repository == 'CESNET/UltraGrid' && github.ref == 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') run: | brew install jq - .github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION.dmg application/x-apple-diskimage macOS%20build + .github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION.dmg application/x-apple-diskimage macOS%20$(uname -m)%20build - name: Upload Build if: steps.upload-release.conclusion == 'skipped' uses: actions/upload-artifact@main with: - name: UltraGrid-macOS + name: UltraGrid-${{ env.VERSION }}-macOS path: UltraGrid-${{ env.VERSION }}.dmg Windows: