compiling

jdx · Dec 6, 2023 · 672f447 · 672f447
1 parent 019fe14
commit 672f447
Show file tree

Hide file tree

Showing 13 changed files with 200 additions and 179 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,11 @@
-[*.sh]
-indent_style = tab
+[*.toml]
+indent_style = space
+indent_size = 2
 
-[Cargo.toml]
+[*.sh]
 indent_style = space
 indent_size = 2
+
+# shfmt
+switch_case_indent = true
+simplify = true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -63,8 +63,18 @@ jobs:
             name: macos-arm64
             target: aarch64-apple-darwin
             runs-on: macos-12
+          - os: macos
+            name: macos
+            target: universal2-apple-darwin
+            runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
+      - run: |
+          brew install zig
+          rustup target add x86_64-apple-darwin
+          rustup target add aarch64-apple-darwin
+          cargo install cargo-zigbuild
+        if: matrix.target == 'universal2-apple-darwin'
       - run: sudo apt-get update; sudo apt-get install musl-tools
         if: matrix.runs-on == 'buildjet-4vcpu-ubuntu-2204-arm'
       - run: rustup target add ${{matrix.target}}

diff --git a/.github/workflows/rtx.yml b/.github/workflows/rtx.yml
@@ -47,6 +47,10 @@ jobs:
     if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: test

diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
@@ -8,29 +8,29 @@ touch rtx/lib/.disable-self-update
 
 tar -xvJf "dist/rtx-$RTX_VERSION-linux-x64.tar.xz"
 fpm -s dir -t deb \
-	--name rtx \
-	--license MIT \
-	--version "${RTX_VERSION#v*}" \
-	--architecture amd64 \
-	--description "Polyglot runtime manager" \
-	--url "https://github.com/jdx/rtx" \
-	--maintainer "Jeff Dickey @jdx" \
-	rtx/bin/rtx=/usr/bin/rtx \
-	rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
-	rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
+  --name rtx \
+  --license MIT \
+  --version "${RTX_VERSION#v*}" \
+  --architecture amd64 \
+  --description "Polyglot runtime manager" \
+  --url "https://github.com/jdx/rtx" \
+  --maintainer "Jeff Dickey @jdx" \
+  rtx/bin/rtx=/usr/bin/rtx \
+  rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
+  rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
 
 tar -xvJf "dist/rtx-$RTX_VERSION-linux-arm64.tar.xz"
 fpm -s dir -t deb \
-	--name rtx \
-	--license MIT \
-	--version "${RTX_VERSION#v*}" \
-	--architecture arm64 \
-	--description "Polyglot runtime manager" \
-	--url "https://github.com/jdx/rtx" \
-	--maintainer "Jeff Dickey @jdx" \
-	rtx/bin/rtx=/usr/bin/rtx \
-	rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
-	rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
+  --name rtx \
+  --license MIT \
+  --version "${RTX_VERSION#v*}" \
+  --architecture arm64 \
+  --description "Polyglot runtime manager" \
+  --url "https://github.com/jdx/rtx" \
+  --maintainer "Jeff Dickey @jdx" \
+  rtx/bin/rtx=/usr/bin/rtx \
+  rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
+  rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
 
 mkdir -p dist/deb/pool/main
 cp -v ./*.deb dist/deb/pool/main

diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh
@@ -8,29 +8,29 @@ touch rtx/lib/.disable-self-update
 
 tar -xvJf "dist/rtx-$RTX_VERSION-linux-x64.tar.xz"
 fpm -s dir -t rpm \
-	--name rtx \
-	--license MIT \
-	--version "${RTX_VERSION#v*}" \
-	--architecture x86_64 \
-	--description "Polyglot runtime manager" \
-	--url "https://github.com/jdx/rtx" \
-	--maintainer "Jeff Dickey @jdx" \
-	rtx/bin/rtx=/usr/bin/rtx \
-	rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
-	rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
+  --name rtx \
+  --license MIT \
+  --version "${RTX_VERSION#v*}" \
+  --architecture x86_64 \
+  --description "Polyglot runtime manager" \
+  --url "https://github.com/jdx/rtx" \
+  --maintainer "Jeff Dickey @jdx" \
+  rtx/bin/rtx=/usr/bin/rtx \
+  rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
+  rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
 
 tar -xvJf "dist/rtx-$RTX_VERSION-linux-arm64.tar.xz"
 fpm -s dir -t rpm \
-	--name rtx \
-	--license MIT \
-	--version "${RTX_VERSION#v*}" \
-	--architecture aarch64 \
-	--description "Polyglot runtime manager" \
-	--url "https://github.com/jdx/rtx" \
-	--maintainer "Jeff Dickey @jdx" \
-	rtx/bin/rtx=/usr/bin/rtx \
-	rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
-	rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
+  --name rtx \
+  --license MIT \
+  --version "${RTX_VERSION#v*}" \
+  --architecture aarch64 \
+  --description "Polyglot runtime manager" \
+  --url "https://github.com/jdx/rtx" \
+  --maintainer "Jeff Dickey @jdx" \
+  rtx/bin/rtx=/usr/bin/rtx \
+  rtx/lib/.disable-self-update=/usr/lib/rtx/.disable-self-update \
+  rtx/man/man1/rtx.1=/usr/share/man/man1/rtx.1
 
 cat <<EOF >~/.rpmmacros
 %_signature gpg

diff --git a/scripts/build-tarball.sh b/scripts/build-tarball.sh
@@ -2,72 +2,72 @@
 set -euo pipefail
 
 error() {
-	echo "$@" >&2
-	exit 1
+  echo "$@" >&2
+  exit 1
 }
 
 NAME="$1"
 shift
 
 for arg in "$@"; do
-	if [ "${next_target:-}" = 1 ]; then
-		next_target=
-		TARGET="$arg"
-		continue
-	fi
-	case "$arg" in
-	--target)
-		next_target=1
-		;;
-	*) ;;
+  if [ "${next_target:-}" = 1 ]; then
+    next_target=
+    TARGET="$arg"
+    continue
+  fi
+  case "$arg" in
+    --target)
+      next_target=1
+      ;;
+    *) ;;
 
-	esac
+  esac
 done
 
 RUST_TRIPLE=${TARGET:-$(rustc -vV | grep ^host: | cut -d ' ' -f2)}
 #region os/arch
 get_os() {
-	case "$RUST_TRIPLE" in
-	*-apple-darwin*)
-		echo "macos"
-		;;
-	*-linux-*)
-		echo "linux"
-		;;
-	*)
-		error "unsupported OS: $RUST_TRIPLE"
-		;;
-	esac
+  case "$RUST_TRIPLE" in
+    *-apple-darwin*)
+      echo "macos"
+      ;;
+    *-linux-*)
+      echo "linux"
+      ;;
+    *)
+      error "unsupported OS: $RUST_TRIPLE"
+      ;;
+  esac
 }
 
 get_arch() {
-	case "$RUST_TRIPLE" in
-	aarch64-*)
-		echo "arm64"
-		;;
-	arm-*)
-		echo "armv6"
-		;;
-	armv7-*)
-		echo "armv7"
-		;;
-	x86_64-*)
-		echo "x64"
-		;;
-	*)
-		error "unsupported arch: $RUST_TRIPLE"
-		;;
-	esac
+  case "$RUST_TRIPLE" in
+    aarch64-*)
+      echo "arm64"
+      ;;
+    arm-*)
+      echo "armv6"
+      ;;
+    armv7-*)
+      echo "armv7"
+      ;;
+    x86_64-*)
+      echo "x64"
+      ;;
+    *)
+      error "unsupported arch: $RUST_TRIPLE"
+      ;;
+  esac
 }
 get_suffix() {
-	case "$RUST_TRIPLE" in
-	*-musl | *-musleabi | *-musleabihf)
-		echo "-musl"
-		;;
-	*)
-		echo ""
-		;;
-	esac
+  case "$RUST_TRIPLE" in
+    *-musl | *-musleabi | *-musleabihf)
+      echo "-musl"
+      ;;
+    *)
+      echo ""
+      ;;
+  esac
 }
 #endregion
 
@@ -76,9 +76,11 @@ VERSION=$(./scripts/get-version.sh)
 BASENAME=$NAME-$VERSION-$(get_os)-$(get_arch)$(get_suffix)
 
 if command -v cross >/dev/null; then
-	cross build "$@"
+  cross build "$@"
+elif command -v zig >/dev/null; then
+  cargo zigbuild "$@"
 else
-	cargo build "$@"
+  cargo build "$@"
 fi
 mkdir -p dist/rtx/bin
 mkdir -p dist/rtx/man/man1
@@ -94,8 +96,8 @@ tar -cJf "$BASENAME.tar.xz" rtx
 tar -czf "$BASENAME.tar.gz" rtx
 
 if [ -f ~/.zipsign/rtx.priv ]; then
-	zipsign sign tar "$BASENAME.tar.gz" ~/.zipsign/rtx.priv
-	zipsign verify tar "$BASENAME.tar.gz" ../zipsign.pub
+  zipsign sign tar "$BASENAME.tar.gz" ~/.zipsign/rtx.priv
+  zipsign verify tar "$BASENAME.tar.gz" ../zipsign.pub
 fi
 
 ls -oh "$BASENAME.tar.xz"
diff --git a/scripts/pre-release-hook.sh b/scripts/pre-release-hook.sh
@@ -2,9 +2,9 @@
 set -euxo pipefail
 
 if [[ "${NO_UPDATE:-}" == "1" ]]; then
-	echo "NO_UPDATE is set, skipping update"
+  echo "NO_UPDATE is set, skipping update"
 else
-	cargo update && git add Cargo.lock
+  cargo update && git add Cargo.lock
 fi
 
 just render-mangen render-help

diff --git a/scripts/publish-s3.sh b/scripts/publish-s3.sh
@@ -26,6 +26,6 @@ aws s3 cp artifacts/deb/dists/ "s3://$AWS_S3_BUCKET/deb/dists/" --cache-control
 export CLOUDFLARE_ACCOUNT_ID=6e243906ff257b965bcae8025c2fc344
 export CLOUDFLARE_ZONE_ID=80d977fd09f01db52bec165778088891
 curl --fail-with-body -X POST "https://api.cloudflare.com/client/v4/zones/$CLOUDFLARE_ZONE_ID/purge_cache" \
-	-H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
-	-H "Content-Type: application/json" \
-	--data '{ "purge_everything": true }'
+  -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
+  -H "Content-Type: application/json" \
+  --data '{ "purge_everything": true }'