Update actions workflow

Use self-hosted macOS runner
Add timeout
Fix issue in package script for macOS

Author: lrettig

.github/workflows/build_and_release.yml

@@ -40,13 +40,15 @@ jobs:
 
   build-and-release:
     needs: prepare
+    timeout-minutes: 60
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os:
+          # self-hosted ARM macOS runner
+          - self-hosted
           - ubuntu-latest
-          - macos-latest
 
     steps:
       - name: Free Disk Space (Ubuntu)

package.sh

@@ -5,5 +5,17 @@ set -euo pipefail
 source config.sh
 
 TOOLCHAIN_DIR=rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2
-cp -n rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2-tools-bin/* $TOOLCHAIN_DIR/bin
+TOOLS_BIN_DIR=rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2-tools-bin
+
+# Function to copy files, ignoring errors if destination exists
+copy_ignore_existing() {
+    cp "$1" "$2" 2>/dev/null || true
+}
+
+# Copy files from stage2-tools-bin to stage2/bin, ignoring if they already exist
+for file in "$TOOLS_BIN_DIR"/*; do
+    copy_ignore_existing "$file" "$TOOLCHAIN_DIR/bin/"
+done
+
+# Create tarball
 tar --exclude lib/rustlib/src --exclude lib/rustlib/rustc-src -hczvf $ARTIFACT_NAME.tar.gz -C $TOOLCHAIN_DIR .