release: support more arm architectures

jdx · Dec 6, 2023 · 29f525b · 29f525b
1 parent d6ee86e
commit 29f525b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/rtx.yml b/.github/workflows/rtx.yml
@@ -89,10 +89,14 @@ jobs:
  fail-fast: false
  matrix:
  target:
- - aarch64-unknown-linux-gnu
  - x86_64-unknown-linux-gnu
- - arm-unknown-linux-musleabihf
- - armv7-unknown-linux-gnueabihf
+ - x86_64-unknown-linux-musl
+ - aarch64-unknown-linux-gnu
+ - aarch64-unknown-linux-musl
+ - armv7-unknown-linux-gnueabi
+ - armv7-unknown-linux-musleabi
+ - arm-unknown-linux-gnueabi
+ - arm-unknown-linux-musleabi
  steps:
  - uses: actions/checkout@v4
  - name: Rust Cache

diff --git a/scripts/build-tarball.sh b/scripts/build-tarball.sh
@@ -59,11 +59,21 @@ get_arch() {
  ;;
  esac
 }
+get_suffix() {
+ case "$RUST_TRIPLE" in
+ *-musl | *-musleabi | *-musleabihf)
+ echo "-musl"
+ ;;
+ *)
+ echo ""
+ ;;
+ esac
+}
 #endregion
 
 set -x
 VERSION=$(./scripts/get-version.sh)
-BASENAME=$NAME-$VERSION-$(get_os)-$(get_arch)
+BASENAME=$NAME-$VERSION-$(get_os)-$(get_arch)$(get_suffix)
 
 if [ "${CROSS:-}" = "1" ]; then
  cross build "$@"

diff --git a/scripts/release-npm.sh b/scripts/release-npm.sh
@@ -22,9 +22,13 @@ dist_tag="$(dist_tag_from_version "$RTX_VERSION")"
 
 platforms=(
  linux-x64
+ linux-x64-musl
  linux-arm64
+ linux-arm64-musl
  linux-armv6
+ linux-armv6-musl
  linux-armv7
+ linux-armv7-musl
  macos-x64
  macos-arm64
 )

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -10,24 +10,21 @@ export RTX_VERSION RELEASE_DIR
 rm -rf "${RELEASE_DIR:?}/$RTX_VERSION"
 mkdir -p "$RELEASE_DIR/$RTX_VERSION"
 
-targets=(
- x86_64-unknown-linux-gnu
- aarch64-unknown-linux-gnu
- arm-unknown-linux-gnueabihf
- armv7-unknown-linux-gnueabihf
- x86_64-apple-darwin
- aarch64-apple-darwin
-)
+targets=$(find artifacts -name 'tarball-*' -exec basename {} \; | sed 's/^tarball-//')
 for target in "${targets[@]}"; do
  cp "artifacts/tarball-$target/"*.tar.gz "$RELEASE_DIR/$RTX_VERSION"
  cp "artifacts/tarball-$target/"*.tar.xz "$RELEASE_DIR/$RTX_VERSION"
 done
 
 platforms=(
  linux-x64
+ linux-x64-musl
  linux-arm64
+ linux-arm64-musl
  linux-armv6
+ linux-armv6-musl
  linux-armv7
+ linux-armv7-musl
  macos-x64
  macos-arm64
 )

diff --git a/scripts/render-homebrew.sh b/scripts/render-homebrew.sh
@@ -4,9 +4,13 @@ set -euxo pipefail
 # shellcheck disable=SC2016
 RTX_VERSION=${RTX_VERSION#v*} \
  RTX_CHECKSUM_LINUX_X86_64=$(grep "rtx-v$RTX_VERSION-linux-x64.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
+ RTX_CHECKSUM_LINUX_X86_64_MUSL=$(grep "rtx-v$RTX_VERSION-linux-x64-musl.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  RTX_CHECKSUM_LINUX_ARM64=$(grep "rtx-v$RTX_VERSION-linux-arm64.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
+ RTX_CHECKSUM_LINUX_ARM64_MUSL=$(grep "rtx-v$RTX_VERSION-linux-arm64-musl.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  RTX_CHECKSUM_LINUX_ARMV6=$(grep "rtx-v$RTX_VERSION-linux-armv6.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
+ RTX_CHECKSUM_LINUX_ARMV6_MUSL=$(grep "rtx-v$RTX_VERSION-linux-armv6-musl.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  RTX_CHECKSUM_LINUX_ARMV7=$(grep "rtx-v$RTX_VERSION-linux-armv7.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
+ RTX_CHECKSUM_LINUX_ARMV7_MUSL=$(grep "rtx-v$RTX_VERSION-linux-armv7-musl.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  RTX_CHECKSUM_MACOS_X86_64=$(grep "rtx-v$RTX_VERSION-macos-x64.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  RTX_CHECKSUM_MACOS_ARM64=$(grep "rtx-v$RTX_VERSION-macos-arm64.tar.xz" "$RELEASE_DIR/v$RTX_VERSION/SHASUMS256.txt" | cut -d ' ' -f1) \
  envsubst '$RTX_VERSION,$RTX_CHECKSUM_LINUX_X86_64,$RTX_CHECKSUM_LINUX_ARM64,$RTX_CHECKSUM_MACOS_X86_64,$RTX_CHECKSUM_MACOS_ARM64' \

diff --git a/scripts/render-install.sh b/scripts/render-install.sh
@@ -4,9 +4,13 @@ set -euxo pipefail
 # shellcheck disable=SC2016
 RTX_VERSION=$RTX_VERSION \
  RTX_CHECKSUM_LINUX_X86_64=$(grep "rtx-v.*linux-x64.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
+ RTX_CHECKSUM_LINUX_X86_64_MUSL=$(grep "rtx-v.*linux-x64-musl.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  RTX_CHECKSUM_LINUX_ARM64=$(grep "rtx-v.*linux-arm64.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
+ RTX_CHECKSUM_LINUX_ARM64_MUSL=$(grep "rtx-v.*linux-arm64-musl.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  RTX_CHECKSUM_LINUX_ARMV6=$(grep "rtx-v.*linux-armv6.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
+ RTX_CHECKSUM_LINUX_ARMV6_MUSL=$(grep "rtx-v.*linux-armv6-musl.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  RTX_CHECKSUM_LINUX_ARMV7=$(grep "rtx-v.*linux-armv7.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
+ RTX_CHECKSUM_LINUX_ARMV7_MUSL=$(grep "rtx-v.*linux-armv7-musl.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  RTX_CHECKSUM_MACOS_X86_64=$(grep "rtx-v.*macos-x64.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  RTX_CHECKSUM_MACOS_ARM64=$(grep "rtx-v.*macos-arm64.tar.gz" "$RELEASE_DIR/$RTX_VERSION/SHASUMS256.txt") \
  envsubst '$RTX_VERSION,$RTX_CHECKSUM_LINUX_X86_64,$RTX_CHECKSUM_LINUX_ARM64,$RTX_CHECKSUM_MACOS_X86_64,$RTX_CHECKSUM_MACOS_ARM64' \