diff options
| author | QMK Bot <hello@qmk.fm> | 2023-04-09 21:38:46 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-04-09 21:38:46 +0000 |
| commit | 15e5a586c1f7c53930afbb291c610cc5344dcf66 (patch) | |
| tree | cb8ca4985fdb21fcf8af651d100e7196c484db0e /.github | |
| parent | da1a52ac65c540386d8f6dcf5d58eec7d5bb239a (diff) | |
| parent | fb706f42a2f02655f4a231edf6661ed23e70321d (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci_builds.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml index c65db1eb48..b3bb83fa85 100644 --- a/.github/workflows/ci_builds.yml +++ b/.github/workflows/ci_builds.yml @@ -4,9 +4,16 @@ permissions: contents: read on: + push: + branches: [master, develop] workflow_dispatch: - schedule: - - cron: '0 0,12 * * *' + inputs: + branch: + type: choice + description: 'Branch to build' + options: [master, develop] + +concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }} jobs: ci_builds: @@ -18,7 +25,6 @@ jobs: strategy: fail-fast: false matrix: - branch: [master, develop] keymap: [default, via] container: ghcr.io/qmk/qmk_cli @@ -30,7 +36,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive - ref: ${{ matrix.branch }} + ref: ${{ github.event.inputs.branch || github.ref }} - name: Install dependencies run: pip3 install -r requirements.txt @@ -50,7 +56,7 @@ jobs: uses: actions/upload-artifact@v3 if: always() with: - name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }} + name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }} if-no-files-found: ignore path: | *.bin @@ -65,4 +71,4 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }} run: | python3 -m pip install -r requirements.txt - python3 ./discord-results.py --branch ${{ matrix.branch }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} |