diff options
| author | John MacFarlane <[email protected]> | 2023-03-12 20:36:45 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2023-03-12 20:36:45 -0700 |
| commit | 7916940c23f68037a8579b2d3076abd269578233 (patch) | |
| tree | 79687849c477ddd0a44c6ba8ffd581843b3834c1 | |
| parent | 2c7b7620abc5c6e4440839ca2a1f0ab4c7561817 (diff) | |
More macos release candidate tweaks.
| -rw-r--r-- | .github/workflows/release-candidate.yml | 4 | ||||
| -rw-r--r-- | macos/distribution.xml.in | 2 | ||||
| -rw-r--r-- | macos/make_macos_release.sh | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index ac6eed3e8..93fa43b44 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -80,8 +80,8 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: macos-amd64 - path: macos-amd64 + name: macos-x86_64 + path: macos-x86_64 # linux: diff --git a/macos/distribution.xml.in b/macos/distribution.xml.in index 145fc0f21..dea4df432 100644 --- a/macos/distribution.xml.in +++ b/macos/distribution.xml.in @@ -8,7 +8,7 @@ <!-- <welcome file="welcome.html" mime-type="text/html" /> --> <license file="license.html" mime-type="text/html" /> <!-- <conclusion file="conclusion.html" mime-type="text/html" /> --> - <options hostArchitectures="x86_64" /> + <options hostArchitectures="ARCHITECTURE" /> <!-- List all component packages --> <pkg-ref id="net.johnmacfarlane.pandoc" version="PANDOCVERSION" diff --git a/macos/make_macos_release.sh b/macos/make_macos_release.sh index 6eb5fd440..8f05500a4 100644 --- a/macos/make_macos_release.sh +++ b/macos/make_macos_release.sh @@ -1,14 +1,6 @@ #!/bin/sh -e MACHINE=$(uname -m) -case "$MACHINE" in - x86_64) ARCHITECTURE=amd64;; - i686) ARCHITECTURE=i386;; - i386) ARCHITECTURE=i386;; - aarch64) ARCHITECTURE=arm64;; - armv6l | armv7l) ARCHITECTURE=armhf;; - *) ARCHITECTURE=unknown;; -esac VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $2;}') ARTIFACTS=macos-$MACHINE @@ -46,7 +38,7 @@ cp man/pandoc-lua.1 "$DEST/share/man/man1/pandoc-lua.1" # Prepare distribution directory; after downloading, run 'make' to notarize echo "Preparing distribution directory..." chown -R "$ME:staff" "$ROOT" -sed -e "s/PANDOCVERSION/$VERSION/" macos/distribution.xml.in > "$ARTIFACTS/distribution.xml" +sed -e "s/PANDOCVERSION/$VERSION/; s/ARCHITECTURE/$MACHINE/;" macos/distribution.xml.in > "$ARTIFACTS/distribution.xml" cp macos/Makefile "$ARTIFACTS/" echo "$VERSION" > "$ARTIFACTS/version.txt" |