artifacts + x86_64 macos

succinctlabs · Feb 23, 2024 · e3d281f · e3d281f
1 parent 5c19843
commit e3d281f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,9 @@ jobs:
         include:
           - os: macos-14
             triple: aarch64-apple-darwin
-          - os: ubuntu-22.04
+          - os: macos-13
+            triple: x86_64-apple-darwin
+          - os: buildjet-32vcpu-ubuntu-2204
             triple: x86_64-unknown-linux-gnu
           - os: buildjet-32vcpu-ubuntu-2204-arm
             triple: aarch64-unknown-linux-gnu
@@ -59,6 +61,4 @@ jobs:
         with:
           name: rust-toolchain-${{ matrix.triple }}
           path: |
-            rust/build/${{ matrix.triple }}/stage2
-            !rust/build/${{ matrix.triple }}/stage2/lib/rustlib/src
-            !rust/build/${{ matrix.triple }}/stage2/lib/rustlib/rustc-src
+            sp1/rust-toolchain-${{ matrix.triple }}.tar.gz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-    - '*'
+      - "*"
 
 jobs:
   build:
@@ -14,27 +14,18 @@ jobs:
     permissions:
       contents: write
     steps:
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
-      with:
-        path: artifacts
-    - name: Compress artifacts
-      shell: bash
-      run: |
-        ls -lha ./artifacts
-        mkdir assets
-        for DIR in $(ls ./artifacts); do
-          tar czf "assets/$DIR.tar.gz" -C "artifacts/$DIR" .
-        done
-        ls -lha ./assets
-    - name: Create release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        echo "Installing gh CLI..."
-        curl -L https://github.com/cli/cli/releases/download/v2.17.0/gh_2.17.0_linux_amd64.tar.gz | \
-          tar xvz  --strip-components=2 --exclude=man
-        chmod +x ./gh
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Installing gh CLI..."
+          curl -L https://github.com/cli/cli/releases/download/v2.17.0/gh_2.17.0_linux_amd64.tar.gz | \
+            tar xvz  --strip-components=2 --exclude=man
+          chmod +x ./gh
 
-        ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./assets/* || \
-        ./gh release upload --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./assets/*
+          ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./artifacts/* || \
+          ./gh release upload --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./artifacts/*