Skip to content

Commit

Permalink
ci tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
mxcl committed Dec 13, 2023
1 parent 4cc81d6 commit 05bb30a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/pkg-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
more legible
required: false
type: string
tinyname:
description: >
GitHub Actions has a non resizable sidebar so we need a shorter name
or it’s much harder to differentiate the different jobs.
os:
required: true
type: string
Expand Down Expand Up @@ -48,7 +52,7 @@ on:

jobs:
build:
name: build (${{inputs.name}})
name: build ${{inputs.tinyname}}
runs-on: ${{ fromJSON(inputs.os) }}
container: ${{ inputs.container }}
outputs:
Expand Down Expand Up @@ -85,7 +89,7 @@ jobs:
- uses: pkgxdev/brewkit/upload-build-artifact@v1

test:
name: test (${{inputs.name}}) ${{ matrix.container || ''}} ${{ join(matrix.os) }}
name: test ${{inputs.tinyname}} ${{ matrix.container || ''}} ${{ join(matrix.os, '+') }}
needs: build
strategy:
matrix:
Expand All @@ -104,7 +108,7 @@ jobs:
pkg: ${{ needs.build.outputs.pkg }}

bottle:
name: bottle (${{inputs.name}}+${{matrix.compression}})
name: bottle (${{inputs.tinyname}}, ${{matrix.compression}})
needs: [build, test]
strategy:
matrix:
Expand Down Expand Up @@ -168,7 +172,8 @@ jobs:
id: put
if: ${{ ! inputs.dry-run }}

versions:
publish:
name: publish ${{inputs.tinyname}} ${{ inputs.dry-run && 'dry-run' }}
runs-on: ubuntu-latest
needs: [bottle, build]
env:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
default: false

jobs:
get-matrix:
compute-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.matrix.outputs.matrix }}
Expand All @@ -22,8 +22,8 @@ jobs:
- run: .github/scripts/get-matrix.ts ${{ inputs.pkg }}
id: matrix

pkgit:
needs: get-matrix
pkg:
needs: compute-matrix
name: ${{matrix.platform.tinyname}}
strategy:
fail-fast: false
Expand All @@ -38,4 +38,5 @@ jobs:
test-os: ${{ toJSON(matrix.platform.test-os) }}
test-container: ${{ toJSON(matrix.platform.test-container) }}
dry-run: ${{ inputs.dry-run }}
tinyname: matrix.platform.tinyname
secrets: inherit

0 comments on commit 05bb30a

Please sign in to comment.