chore: build osx x86_64 artifacts on buildkite (solana-labs#25138)

* chore: build osx x86_64 artifacts on buildkite * chore: remove osx artifacts building flow from github action
cnpryer · May 11, 2022 · 46c1ca6 · 46c1ca6
1 parent 6880098
commit 46c1ca6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 84 deletions.
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
@@ -15,90 +15,6 @@ on:
         required: true
 
 jobs:
-  osx-build:
-    runs-on: macos-12
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      # copy the newest version env.sh before switching version.
-      - name: Copy Env Script
-        shell: bash
-        run: |
-          cp -r ci/env.sh /tmp/env.sh
-
-      - name: Switch Version
-        if: ${{ inputs.tag }}
-        run: |
-          git checkout ${{ inputs.tag }}
-
-      - name: Build
-        shell: bash
-        run: |
-          brew install coreutils
-          PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
-          brew install gnu-tar
-          PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
-          source /tmp/env.sh
-          tar --version
-          ci/publish-tarball.sh
-          mkdir -p "github-action-s3-upload/${{ inputs.tag }}"
-          cp -v "solana-release-x86_64-apple-darwin.tar.bz2" "github-action-s3-upload/${{ inputs.tag }}/"
-          cp -v "solana-release-x86_64-apple-darwin.yml" "github-action-s3-upload/${{ inputs.tag }}/"
-          cp -v "solana-install-init-x86_64-apple-darwin"* "github-action-s3-upload/${{ inputs.tag }}/"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: osx-artifact
-          path: github-action-s3-upload/
-
-  osx-s3-upload:
-    needs: [osx-build]
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Download
-        uses: actions/download-artifact@v3
-        with:
-          name: osx-artifact
-          path: ./github-action-s3-upload
-
-      - name: Upload
-        uses: jakejarvis/s3-sync-action@master
-        with:
-          args: --acl public-read --follow-symlinks
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
-          AWS_REGION: "us-west-1"
-          SOURCE_DIR: "github-action-s3-upload"
-
-  osx-gh-release:
-    needs: [osx-build]
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Download
-        uses: actions/download-artifact@v3
-        with:
-          name: osx-artifact
-          path: ./github-action-s3-upload
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ inputs.tag }}
-          draft: true
-          files: |
-            github-action-s3-upload/${{ inputs.tag }}/*
-
   windows-build:
     runs-on: windows-2022
     steps:

diff --git a/ci/buildkite-secondary.yml b/ci/buildkite-secondary.yml
@@ -24,3 +24,8 @@ steps:
       - "queue=release-build-aarch64-apple-darwin"
     timeout_in_minutes: 60
     name: "publish tarball (aarch64-apple-darwin)"
+  - command: "ci/publish-tarball.sh"
+    agents:
+      - "queue=release-build-x86_64-apple-darwin"
+    timeout_in_minutes: 60
+    name: "publish tarball (x86_64-apple-darwin)"