From 5df7e65838851e05874158c96f741b66837e8ac3 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 18 Oct 2022 23:32:18 -0400 Subject: [PATCH] move aarch64 to hosted runners --- .github/workflows/build.yml | 71 +++++++++++++++++++++---------- .github/workflows/ci.yml | 2 - .github/workflows/new-version.yml | 1 - 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68c4306e..e1143e8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,35 +5,25 @@ on: projects: required: true type: string - ref: - required: true - type: string env: TEA_SECRET: ${{ secrets.TEA_SECRET }} jobs: - queue-builder: - runs-on: ubuntu-latest - steps: - - name: queue - run: | - # Don't use GITHUB_SHA for PRs: https://github.com/orgs/community/discussions/25191 - curl https://app.tea.xyz/api/builder/enqueue \ - -H "authorization: bearer ${{ secrets.TEA_API_TOKEN }}" \ - -d "${{inputs.ref}} ${{ inputs.projects }}" - build: runs-on: ${{ matrix.os }} strategy: matrix: include: - os: macos-11 - container: ~ - os: ubuntu-latest container: image: debian:buster-slim options: --memory=16g + - os: [self-hosted, macOS, ARM64] + tag: darwin-aarch64 + - os: [self-hosted, linux, ARM64] + tag: linux-aarch64 container: ${{ matrix.container }} outputs: built: ${{ steps.build.outputs.pkgs }} @@ -52,6 +42,15 @@ jobs: repository: teaxyz/cli token: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} + - run: | + if test -d $TEA_PREFIX/tea.xyz; then + find $TEA_PREFIX/tea.xyz -mindepth 1 -maxdepth 1 -not \( -path $TEA_PREFIX/tea.xyz/var \) -print0 | \ + xargs -0 rm -rf + fi + if: ${{ matrix.tag }} + env: + TEA_PREFIX: /opt + - uses: teaxyz/setup@v0 id: tea with: @@ -72,7 +71,9 @@ jobs: for x in /usr/local/*; do sudo mv $x /tmp; done ;; *) - exit 1 + # self-hosted runner. noop + echo + ;; esac rm -rf /opt/tea.xyz/var @@ -84,7 +85,7 @@ jobs: - run: cli/scripts/install.ts ${{ steps.sorted.outputs.pre-install }} #FIXME remove later - - run: find /opt -name bin -type d -exec find {} -type f \; | xargs chmod 777 + - run: find /opt -name bin -exec find {} -type f \; | xargs chmod 777 - run: pantry/scripts/build.ts ${{ steps.sorted.outputs.pkgs }} id: build @@ -105,7 +106,7 @@ jobs: - name: upload artifacts uses: actions/upload-artifact@v3 with: - name: ${{ matrix.os }} + name: ${{ matrix.tag || matrix.os }} path: artifacts.tgz if-no-files-found: error @@ -124,6 +125,10 @@ jobs: container: ghcr.io/teaxyz/infuser:slim-latest - os: ubuntu-latest container: debian:buster-slim + - os: [self-hosted, macOS, ARM64] + tag: darwin-aarch64 + - os: [self-hosted, linux, ARM64] + tag: linux-aarch64 container: ${{ matrix.container }} steps: - uses: actions/checkout@v3 @@ -141,6 +146,15 @@ jobs: apt-get --yes install libc-dev libstdc++-8-dev libgcc-8-dev if: ${{ matrix.container != '' }} + - run: | + if test -d $TEA_PREFIX/tea.xyz; then + find $TEA_PREFIX/tea.xyz -mindepth 1 -maxdepth 1 -not \( -path $TEA_PREFIX/tea.xyz/var \) -print0 | \ + xargs -0 rm -rf + fi + if: ${{ matrix.tag }} + env: + TEA_PREFIX: ${{ github.workspace }} + - uses: teaxyz/setup@v0 id: tea with: @@ -149,7 +163,7 @@ jobs: - uses: actions/download-artifact@v3 with: - name: ${{ matrix.os }} + name: ${{ matrix.tag || matrix.os }} - run: tar xzf artifacts.tgz working-directory: ${{ steps.tea.outputs.prefix }} @@ -161,12 +175,16 @@ jobs: run: working-directory: tea.xyz/var/pantry/scripts needs: [test, build] - runs-on: ${{ matrix.platform }} + runs-on: ${{ matrix.platform.os }} strategy: matrix: platform: - - macos-11 - - ubuntu-latest + - os: macos-11 + - os: ubuntu-latest + - os: [self-hosted, macOS, ARM64] + tag: darwin-aarch64 + - os: [self-hosted, linux, ARM64] + tag: linux-aarch64 compression: - xz - gz @@ -181,6 +199,15 @@ jobs: repository: teaxyz/cli token: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} + - run: | + if test -d $TEA_PREFIX/tea.xyz; then + find $TEA_PREFIX/tea.xyz -mindepth 1 -maxdepth 1 -not \( -path $TEA_PREFIX/tea.xyz/var \) -print0 | \ + xargs -0 rm -rf + fi + if: ${{ matrix.platform.tag }} + env: + TEA_PREFIX: ${{ github.workspace }} + - uses: teaxyz/setup@v0 id: tea with: @@ -189,7 +216,7 @@ jobs: - uses: actions/download-artifact@v3 with: - name: ${{ matrix.platform }} + name: ${{ matrix.platform.tag || matrix.platform.os }} path: ${{ steps.tea.outputs.prefix }} - run: tar xzf artifacts.tgz diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bee0112a..432ac5e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,5 @@ jobs: uses: ./.github/workflows/build.yml with: projects: ${{ needs.get-diff.outputs.diff }} - # Don't use GITHUB_SHA for PRs: https://github.com/orgs/community/discussions/25191 - ref: ${{ github.event.pull_request.head.sha }} secrets: inherit if: ${{ needs.get-diff.outputs.diff != '' }} diff --git a/.github/workflows/new-version.yml b/.github/workflows/new-version.yml index b6daddb5..b5fdf17c 100644 --- a/.github/workflows/new-version.yml +++ b/.github/workflows/new-version.yml @@ -13,5 +13,4 @@ jobs: uses: ./.github/workflows/build.yml with: projects: ${{ inputs.projects }} - ref: ${{ github.sha }} secrets: inherit \ No newline at end of file