de-split pantries

I think this is all the changes
This commit is contained in:
Jacob Heider 2023-03-12 00:55:59 -04:00 committed by Max Howell
parent c5595d22e4
commit c2ae029b4a
No known key found for this signature in database
GPG key ID: 741BB84EF5BB9EEC
3 changed files with 4 additions and 6 deletions

View file

@ -116,7 +116,7 @@ jobs:
- name: clean destination - name: clean destination
# Note: needed when changing a directory to a symlink, for example in # Note: needed when changing a directory to a symlink, for example in
# https://github.com/teaxyz/pantry.extra/pull/435 # https://github.com/teaxyz/pantry/pull/435
run: | run: |
tar tzf $GITHUB_WORKSPACE/artifacts.tgz | \ tar tzf $GITHUB_WORKSPACE/artifacts.tgz | \
awk '{ print length, $0 }' | \ awk '{ print length, $0 }' | \
@ -162,7 +162,7 @@ jobs:
stage: stage:
needs: [test] needs: [test]
# this only works for PRs from our team to our repo (security! :( ) # this only works for PRs from our team to our repo (security! :( )
if: startsWith(github.ref, 'refs/pull/') && startsWith(github.repository, 'teaxyz/pantry.') && needs.test.outputs.HAS_SECRETS == 'true' if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz' && needs.test.outputs.HAS_SECRETS == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3

View file

@ -11,8 +11,6 @@ jobs:
has-artifacts: ${{ steps.has-artifacts.outputs.has-artifacts }} has-artifacts: ${{ steps.has-artifacts.outputs.has-artifacts }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
repo: teaxyz/pantry.core
- uses: teaxyz/brewkit/actions/setup-brewkit@v0 - uses: teaxyz/brewkit/actions/setup-brewkit@v0
@ -91,7 +89,7 @@ jobs:
RESULT="$RESULT $y" RESULT="$RESULT $y"
done done
echo "diff=$RESULT" >> $GITHUB_OUTPUT echo "diff=$RESULT" >> $GITHUB_OUTPUT
- run: gh workflow run new-version.yml -R teaxyz/pantry.core -f "projects=$PROJECTS" - run: gh workflow run new-version.yml -f "projects=$PROJECTS"
if: ${{ steps.diff.outputs.diff != '' }} if: ${{ steps.diff.outputs.diff != '' }}
env: env:
GITHUB_TOKEN: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} GITHUB_TOKEN: ${{ secrets.TEMP_JACOBS_GITHUB_PAT }}

View file

@ -24,6 +24,6 @@ jobs:
PR=$(echo ${{github.ref}} | sed -e 's_refs/pull/\(.*\)/merge_\1_') PR=$(echo ${{github.ref}} | sed -e 's_refs/pull/\(.*\)/merge_\1_')
aws s3 rm --recursive s3://$AWS_S3_CACHE/pull-request/$REPO/$PR aws s3 rm --recursive s3://$AWS_S3_CACHE/pull-request/$REPO/$PR
if: startsWith(github.ref, 'refs/pull/') && startsWith(github.repository, 'teaxyz/pantry.') if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz'
env: env:
AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }} AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }}