Skip to content

Commit

Permalink
fix: docker CI job doesn't trigger on master (apache#27261)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch authored and sfirke committed Mar 22, 2024
1 parent 80c3bca commit 0eadf83
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ concurrency:
cancel-in-progress: true

jobs:
setup_matrix:
runs-on: ubuntu-latest
outputs:
matrix_config: ${{ steps.set_matrix.outputs.matrix_config }}
steps:
- id: set_matrix
run: |
MATRIX_CONFIG=$(if [ "${{ github.event_name }}" == "pull_request" ]; then echo '["ci"]'; else echo '["dev", "lean", "py310", "websocket", "dockerize"]'; fi)
echo "matrix_config=${MATRIX_CONFIG}" >> $GITHUB_OUTPUT
echo $GITHUB_OUTPUT
docker-build:
name: docker-build
needs: setup_matrix
runs-on: ubuntu-latest
strategy:
matrix:
build_preset: |
${{ fromJson(github.event_name == 'pull_request' ? '["ci"]' : '["dev", "lean", "py310", "websocket", "dockerize"]') }}
build_preset: ${{fromJson(needs.setup_matrix.outputs.matrix_config)}}
fail-fast: false
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/no-op.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,3 @@ jobs:
run: |
echo "This is a no-op step for python-lint to ensure a successful status."
exit 0
# section to be deleted after master merge
docker-build:
strategy:
matrix:
build_preset: ["dev", "lean", "py310", "websocket", "dockerize"]
platform: ["linux/amd64", "linux/arm64"]
exclude:
- build_preset: "dev"
platform: "linux/arm64"
- build_preset: "lean"
platform: "linux/arm64"
runs-on: ubuntu-latest
steps:
- name: No-op for docker
run: |
echo "No-op to get rid of the docker-build checks reqs in .asf.yml"
exit 0

0 comments on commit 0eadf83

Please sign in to comment.