From d0afeaf2f46d8660ccffba36c241ad9f5df48a10 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 29 Apr 2023 21:45:57 -0400 Subject: [PATCH] have get-platforms partial filter unavailable platforms, instead of dropping (#1739) * improve get-platforms.ts * test half filtered * figured this might be weird * no undefined, i guess. * or double quotes * ready --- .github/workflows/bottle.yml | 4 ++-- .github/workflows/build.yml | 10 +++++----- projects/freedesktop.org/libbsd/package.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index 662754ee..0b986b40 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -34,7 +34,7 @@ jobs: bottle: needs: [get-platform] - if: ${{ needs.get-platform.outputs.available == 'true' }} + if: ${{ needs.get-platform.outputs.available != '' }} runs-on: ${{ fromJson(needs.get-platform.outputs.os) }} outputs: srcs: ${{ env.srcs }} @@ -125,7 +125,7 @@ jobs: upload: needs: [get-platform, bottle] - if: ${{ needs.get-platform.outputs.available == 'true' }} + if: ${{ needs.get-platform.outputs.available != '' }} runs-on: ubuntu-latest steps: - uses: teaxyz/brewkit/actions/setup-brewkit@v0 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e8de9f6..ac997144 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ fromJson(needs.get-platform.outputs.build-os) }} container: ${{ fromJson(needs.get-platform.outputs.container) }} needs: [get-platform] - if: ${{ needs.get-platform.outputs.available == 'true' }} + if: ${{ needs.get-platform.outputs.available != '' }} steps: - uses: actions/checkout@v3 @@ -51,7 +51,7 @@ jobs: p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }} p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} - - run: pkg build ${{ inputs.projects }} + - run: pkg build ${{ needs.get-platform.outputs.available }} id: build env: GITHUB_TOKEN: ${{ github.token }} @@ -93,7 +93,7 @@ jobs: test: needs: [get-platform, build] - if: ${{ needs.get-platform.outputs.available == 'true' }} + if: ${{ needs.get-platform.outputs.available != '' }} runs-on: ${{ matrix.platform.os }} strategy: matrix: @@ -129,7 +129,7 @@ jobs: - name: extract bottles run: tar xzvf artifacts.tgz -C $TEA_PREFIX - - run: pkg test ${{ inputs.projects }} + - run: pkg test ${{ needs.get-platform.outputs.available }} env: GITHUB_TOKEN: ${{ github.token }} # FIXME: this shouldn't be necessary, but it currently is for the @@ -145,7 +145,7 @@ jobs: stage: needs: [get-platform, test] # this only works for PRs from our team to our repo (security! :( ) - if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz' && needs.test.outputs.HAS_SECRETS == 'true' && needs.get-platform.outputs.available == 'true' + if: startsWith(github.ref, 'refs/pull/') && github.repository_owner == 'teaxyz' && needs.test.outputs.HAS_SECRETS == 'true' && needs.get-platform.outputs.available != '' runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 diff --git a/projects/freedesktop.org/libbsd/package.yml b/projects/freedesktop.org/libbsd/package.yml index d5e238ab..920040c9 100644 --- a/projects/freedesktop.org/libbsd/package.yml +++ b/projects/freedesktop.org/libbsd/package.yml @@ -20,4 +20,4 @@ test: dependencies: gnu.org/binutils: '*' script: - nm {{prefix}}/lib/libbsd.so.{{version.major}} | grep strtonum \ No newline at end of file + nm {{prefix}}/lib/libbsd.so.{{version.major}} | grep strtonum