From 0e4d60b9197653b0ab9cb20190e3130d099f228c Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Mon, 8 Aug 2022 19:50:24 -0400 Subject: [PATCH] stub in new_version workflow Must be in main to be dispatchable. --- .github/workflows/build.yml | 104 ++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 98 ++-------------------------- .github/workflows/new_version.yml | 27 ++++++++ 3 files changed, 136 insertions(+), 93 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/new_version.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..931e623e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,104 @@ +name: build +on: + workflow_call: + inputs: + projects: + required: true + type: string + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: + - macos-11 + - ubuntu-latest + include: + - os: macos-11 + container: "~" + - os: ubuntu-latest + container: ghcr.io/teaxyz/infuser:main + container: ${{ matrix.container }} + defaults: + run: + working-directory: pantry + steps: + - name: co pantry + uses: actions/checkout@v3 + with: + path: pantry + + - name: co cli + uses: actions/checkout@v3 + with: + path: cli + repository: teaxyz/cli + token: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} + + - name: HACKS + run: | + case ${{ matrix.os }} in + ubuntu-latest) + rm -rf /opt/tea.xyz/var/pantry + ln -s $GITHUB_WORKSPACE/pantry /opt/tea.xyz/var/pantry + mkdir .git # no git in our image + echo "--insecure" >> ~/.curlrc # our curl is broke somehow for rust bootstrap + apt-get --yes install ca-certificates + ;; + macos-11) + sudo mkdir -p /opt/tea.xyz/var + sudo chown -R $(whoami):staff /opt + ln -s $GITHUB_WORKSPACE/pantry /opt/tea.xyz/var/pantry + + # HACKs for teaxyz/setup since it currently requires the working dir to be a srcroot + cp README.md .. + mkdir ../.git + ;; + *) + exit 1 + esac + + - uses: teaxyz/setup@v0 + env: + TEA_SECRET: ${{ secrets.TEA_SECRET }} + if: ${{ matrix.os == 'macos-11' }} + + - name: topological sort + id: sorted + run: ./scripts/sort.ts ${{ inputs.projects }} + + - name: Build + run: | + ./scripts/build.ts ${{ steps.sorted.outputs.pkgs }} + id: build + env: + GITHUB_TOKEN: ${{ github.token }} + FORCE_UNSAFE_CONFIGURE: 1 # some configure scripts refuse to run as root + + - name: Test + run: | + for x in ${{ steps.build.outputs.pkgs }}; do + ./scripts/test.ts $x + done + + - name: Bottle + run: ./scripts/bottle.ts ${{ steps.build.outputs.pkgs }} + id: bottle + + - name: Artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.os }} + path: ${{ steps.bottle.outputs.filenames }} + if-no-files-found: error + + # TODO only upload if all jobs succeed + # TODO only upload when we merge + # TODO upload to a staging location until we release new pantry versions + - name: Upload + run: ./scripts/upload.ts ${{ steps.build.outputs.pkgs }} + env: + AWS_S3: ${{ secrets.AWS_S3 }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f641af2..1cf40c54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,6 @@ concurrency: jobs: get-diff: - # separate step since our image has no `git` runs-on: ubuntu-latest outputs: diff: ${{ steps.diff.outputs.diff }} @@ -18,97 +17,10 @@ jobs: id: diff with: PATTERNS: projects/**/package.yml - build: needs: [get-diff] - runs-on: ${{ matrix.os}} - strategy: - matrix: - include: - - os: macos-11 - container: ~ - - os: ubuntu-latest - container: ghcr.io/teaxyz/infuser:main - container: ${{ matrix.container }} - defaults: - run: - working-directory: pantry - steps: - - name: co pantry - uses: actions/checkout@v3 - with: - path: pantry - - - name: co cli - uses: actions/checkout@v3 - with: - path: cli - repository: teaxyz/cli - token: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} - - - name: HACKS - run: | - case ${{ matrix.os }} in - ubuntu-latest) - rm -rf /opt/tea.xyz/var/pantry - ln -s $GITHUB_WORKSPACE/pantry /opt/tea.xyz/var/pantry - mkdir .git # no git in our image - echo "--insecure" >> ~/.curlrc # our curl is broke somehow for rust bootstrap - apt-get --yes install ca-certificates - ;; - macos-11) - sudo mkdir -p /opt/tea.xyz/var - sudo chown -R $(whoami):staff /opt - ln -s $GITHUB_WORKSPACE/pantry /opt/tea.xyz/var/pantry - - # HACKs for teaxyz/setup since it currently requires the working dir to be a srcroot - cp README.md .. - mkdir ../.git - ;; - *) - exit 1 - esac - - - uses: teaxyz/setup@v0 - env: - TEA_SECRET: ${{ secrets.TEA_SECRET }} - if: ${{ matrix.os == 'macos-11' }} - - - name: topological sort - id: sorted - run: ./scripts/sort.ts ${{ needs.get-diff.outputs.diff }} - - - name: Build - run: | - ./scripts/build.ts ${{ steps.sorted.outputs.pkgs }} - id: build - env: - GITHUB_TOKEN: ${{ github.token }} - FORCE_UNSAFE_CONFIGURE: 1 # some configure scripts refuse to run as root - - - name: Test - run: | - for x in ${{ steps.build.outputs.pkgs }}; do - ./scripts/test.ts $x - done - - - name: Bottle - run: ./scripts/bottle.ts ${{ steps.build.outputs.pkgs }} - id: bottle - - - name: Artifact - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.os }} - path: ${{ steps.bottle.outputs.filenames }} - if-no-files-found: error - - # TODO only upload if all jobs succeed - # TODO only upload when we merge - # TODO upload to a staging location until we release new pantry versions - - name: Upload - run: ./scripts/upload.ts ${{ steps.build.outputs.pkgs }} - env: - AWS_S3: ${{ secrets.AWS_S3 }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + uses: ./.github/workflows/build.yml + with: + projects: ${{ needs.get-diff.outputs.diff }} + secrets: inherit + if: ${{ needs.get-diff.outputs.diff != '' }} \ No newline at end of file diff --git a/.github/workflows/new_version.yml b/.github/workflows/new_version.yml new file mode 100644 index 00000000..a8f20e93 --- /dev/null +++ b/.github/workflows/new_version.yml @@ -0,0 +1,27 @@ +name: new_version +on: + workflow_dispatch: + inputs: + projects: + description: A JSON string containing repository/version values to build + required: true + type: string + +jobs: + find-projects: + runs-on: ubuntu-latest + outputs: + diff: ${{ steps.find.outputs.projects }} + steps: + - uses: actions/checkout@v3 + - name: find + run: | + echo ${{ inputs.projects }} + false + build: + needs: [find-projects] + uses: ./.github/workflows/build.yml + with: + projects: ${{ needs.find-projects.outputs.projects }} + secrets: inherit + if: ${{ needs.find-projects.outputs.projects != '' }} \ No newline at end of file