fix bottle xz/gz versions.txt race

not ideal since S3 uploads are failing so often RN

however ideal sln is complex
This commit is contained in:
Max Howell 2022-10-20 16:50:19 -04:00
parent 395f755010
commit 463ff222dd
2 changed files with 12 additions and 10 deletions

View file

@ -185,9 +185,6 @@ jobs:
tag: darwin-aarch64 tag: darwin-aarch64
- os: [self-hosted, linux, ARM64] - os: [self-hosted, linux, ARM64]
tag: linux-aarch64 tag: linux-aarch64
compression:
- xz
- gz
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -223,17 +220,22 @@ jobs:
working-directory: ${{ steps.tea.outputs.prefix }} working-directory: ${{ steps.tea.outputs.prefix }}
- run: ./bottle.ts ${{ needs.build.outputs.built }} - run: ./bottle.ts ${{ needs.build.outputs.built }}
id: bottle id: bottle-xz
env: env:
COMPRESSION: ${{ matrix.compression }} COMPRESSION: xz
- run: ./bottle.ts ${{ needs.build.outputs.built }}
id: bottle-gz
env:
COMPRESSION: gz
- name: upload bottles - name: upload bottles
id: upload id: upload
run: ./upload.ts run: ./upload.ts
--pkgs ${{ needs.build.outputs.built }} --pkgs ${{ needs.build.outputs.built }} ${{ needs.build.outputs.built }}
--srcs ${{ needs.build.outputs.srcs }} --srcs ${{ needs.build.outputs.srcs }} ${{ needs.build.outputs.srcs }}
--bottles ${{ steps.bottle.outputs.bottles }} --bottles ${{ steps.bottle-gz.outputs.bottles }} ${{ steps.bottle-xz.outputs.bottles }}
--checksums ${{ steps.bottle.outputs.checksums }} --checksums ${{ steps.bottle-gz.outputs.checksums }} ${{ steps.bottle-xz.outputs.checksums }}
env: env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

View file

@ -10,7 +10,7 @@ build:
tea.xyz/gx/make: '*' tea.xyz/gx/make: '*'
tea.xyz/gx/cc: c99 tea.xyz/gx/cc: c99
script: | script: |
./configure --prefix="{{ prefix }}" ./configure --prefix="{{prefix}}"
make --jobs {{ hw.concurrency }} install make --jobs {{ hw.concurrency }} install
test: test: