diff options
| author | Joel Challis <git@zvecr.com> | 2023-03-17 01:32:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 01:32:09 +0000 |
| commit | c7f58145fb8cf5ea4337a1bb0439111fe2ce65f0 (patch) | |
| tree | b6114d8d7ebf5594fb999763e04ce9a602304340 | |
| parent | 79ae14ae0accfdb7496821ed61adbcd4c99fe28a (diff) | |
Update qmk_cli container references (#20154)
| -rw-r--r-- | .github/workflows/api.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cli.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/docs.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format_push.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/regen.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/regen_push.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/unit_test.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | docs/newbs_building_firmware_workflow.md | 2 | ||||
| -rwxr-xr-x | util/docker_build.sh | 2 | ||||
| -rwxr-xr-x | util/docker_cmd.sh | 2 |
14 files changed, 13 insertions, 19 deletions
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 2abfe696fd..38c1cfe506 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml | |||
| @@ -19,7 +19,7 @@ on: | |||
| 19 | jobs: | 19 | jobs: |
| 20 | api_data: | 20 | api_data: |
| 21 | runs-on: ubuntu-latest | 21 | runs-on: ubuntu-latest |
| 22 | container: qmkfm/qmk_cli | 22 | container: ghcr.io/qmk/qmk_cli |
| 23 | 23 | ||
| 24 | # protect against those who work in their fork on 'important' branches | 24 | # protect against those who work in their fork on 'important' branches |
| 25 | if: github.repository == 'qmk/qmk_firmware' | 25 | if: github.repository == 'qmk/qmk_firmware' |
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml index e2bbd93497..787a73a808 100644 --- a/.github/workflows/ci_builds.yml +++ b/.github/workflows/ci_builds.yml | |||
| @@ -22,7 +22,7 @@ jobs: | |||
| 22 | keymap: [default, via] | 22 | keymap: [default, via] |
| 23 | keyboard_folder: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z] | 23 | keyboard_folder: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z] |
| 24 | 24 | ||
| 25 | container: qmkfm/qmk_cli | 25 | container: ghcr.io/qmk/qmk_cli |
| 26 | 26 | ||
| 27 | steps: | 27 | steps: |
| 28 | - name: Disable safe.directory check | 28 | - name: Disable safe.directory check |
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index d98692e6d9..27bdcc562b 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml | |||
| @@ -18,7 +18,7 @@ jobs: | |||
| 18 | test: | 18 | test: |
| 19 | runs-on: ubuntu-latest | 19 | runs-on: ubuntu-latest |
| 20 | 20 | ||
| 21 | container: qmkfm/qmk_cli | 21 | container: ghcr.io/qmk/qmk_cli |
| 22 | 22 | ||
| 23 | steps: | 23 | steps: |
| 24 | - name: Disable safe.directory check | 24 | - name: Disable safe.directory check |
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 841573cf30..923dfc1c1b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml | |||
| @@ -17,7 +17,7 @@ on: | |||
| 17 | jobs: | 17 | jobs: |
| 18 | generate: | 18 | generate: |
| 19 | runs-on: ubuntu-latest | 19 | runs-on: ubuntu-latest |
| 20 | container: qmkfm/qmk_cli | 20 | container: ghcr.io/qmk/qmk_cli |
| 21 | 21 | ||
| 22 | # protect against those who develop with their fork on master | 22 | # protect against those who develop with their fork on master |
| 23 | if: github.repository == 'qmk/qmk_firmware' | 23 | if: github.repository == 'qmk/qmk_firmware' |
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 78aaae8a0e..8ecdf82059 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml | |||
| @@ -19,7 +19,7 @@ jobs: | |||
| 19 | lint: | 19 | lint: |
| 20 | runs-on: ubuntu-latest | 20 | runs-on: ubuntu-latest |
| 21 | 21 | ||
| 22 | container: qmkfm/qmk_cli | 22 | container: ghcr.io/qmk/qmk_cli |
| 23 | 23 | ||
| 24 | steps: | 24 | steps: |
| 25 | - name: Disable safe.directory check | 25 | - name: Disable safe.directory check |
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml index 26e9f4edfb..25655f33b7 100644 --- a/.github/workflows/format_push.yml +++ b/.github/workflows/format_push.yml | |||
| @@ -13,7 +13,7 @@ jobs: | |||
| 13 | lint: | 13 | lint: |
| 14 | runs-on: ubuntu-latest | 14 | runs-on: ubuntu-latest |
| 15 | 15 | ||
| 16 | container: qmkfm/qmk_cli | 16 | container: ghcr.io/qmk/qmk_cli |
| 17 | 17 | ||
| 18 | steps: | 18 | steps: |
| 19 | - name: Disable safe.directory check | 19 | - name: Disable safe.directory check |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6b4e266bde..91932b323a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml | |||
| @@ -12,7 +12,7 @@ jobs: | |||
| 12 | lint: | 12 | lint: |
| 13 | runs-on: ubuntu-latest | 13 | runs-on: ubuntu-latest |
| 14 | 14 | ||
| 15 | container: qmkfm/qmk_cli | 15 | container: ghcr.io/qmk/qmk_cli |
| 16 | 16 | ||
| 17 | steps: | 17 | steps: |
| 18 | - name: Disable safe.directory check | 18 | - name: Disable safe.directory check |
diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml index f301000d55..a2b4ef2b93 100644 --- a/.github/workflows/regen.yml +++ b/.github/workflows/regen.yml | |||
| @@ -13,7 +13,7 @@ jobs: | |||
| 13 | regen: | 13 | regen: |
| 14 | runs-on: ubuntu-latest | 14 | runs-on: ubuntu-latest |
| 15 | 15 | ||
| 16 | container: qmkfm/qmk_cli | 16 | container: ghcr.io/qmk/qmk_cli |
| 17 | 17 | ||
| 18 | steps: | 18 | steps: |
| 19 | - name: Disable safe.directory check | 19 | - name: Disable safe.directory check |
diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml index c56bc48a69..b8197263a6 100644 --- a/.github/workflows/regen_push.yml +++ b/.github/workflows/regen_push.yml | |||
| @@ -13,7 +13,7 @@ jobs: | |||
| 13 | regen: | 13 | regen: |
| 14 | runs-on: ubuntu-latest | 14 | runs-on: ubuntu-latest |
| 15 | 15 | ||
| 16 | container: qmkfm/qmk_cli | 16 | container: ghcr.io/qmk/qmk_cli |
| 17 | 17 | ||
| 18 | steps: | 18 | steps: |
| 19 | - name: Disable safe.directory check | 19 | - name: Disable safe.directory check |
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 75ed84177b..fb538d4f84 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml | |||
| @@ -23,7 +23,7 @@ jobs: | |||
| 23 | test: | 23 | test: |
| 24 | runs-on: ubuntu-latest | 24 | runs-on: ubuntu-latest |
| 25 | 25 | ||
| 26 | container: qmkfm/qmk_cli | 26 | container: ghcr.io/qmk/qmk_cli |
| 27 | 27 | ||
| 28 | steps: | 28 | steps: |
| 29 | - uses: actions/checkout@v3 | 29 | - uses: actions/checkout@v3 |
diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e283c8f98a..0000000000 --- a/Dockerfile +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | FROM qmkfm/qmk_cli | ||
| 2 | |||
| 3 | VOLUME /qmk_firmware | ||
| 4 | WORKDIR /qmk_firmware | ||
| 5 | |||
| 6 | CMD qmk compile -kb all -km default | ||
diff --git a/docs/newbs_building_firmware_workflow.md b/docs/newbs_building_firmware_workflow.md index e6895252aa..51ce304901 100644 --- a/docs/newbs_building_firmware_workflow.md +++ b/docs/newbs_building_firmware_workflow.md | |||
| @@ -95,7 +95,7 @@ on: [push, workflow_dispatch] | |||
| 95 | jobs: | 95 | jobs: |
| 96 | build: | 96 | build: |
| 97 | runs-on: ubuntu-latest | 97 | runs-on: ubuntu-latest |
| 98 | container: qmkfm/qmk_cli | 98 | container: ghcr.io/qmk/qmk_cli |
| 99 | strategy: | 99 | strategy: |
| 100 | fail-fast: false | 100 | fail-fast: false |
| 101 | matrix: | 101 | matrix: |
diff --git a/util/docker_build.sh b/util/docker_build.sh index 8dce387320..828b5751af 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh | |||
| @@ -81,5 +81,5 @@ fi | |||
| 81 | -e ALT_GET_KEYBOARDS=true \ | 81 | -e ALT_GET_KEYBOARDS=true \ |
| 82 | -e SKIP_GIT="$SKIP_GIT" \ | 82 | -e SKIP_GIT="$SKIP_GIT" \ |
| 83 | -e MAKEFLAGS="$MAKEFLAGS" \ | 83 | -e MAKEFLAGS="$MAKEFLAGS" \ |
| 84 | qmkfm/qmk_cli \ | 84 | ghcr.io/qmk/qmk_cli \ |
| 85 | make "$keyboard${keymap:+:$keymap}${target:+:$target}" | 85 | make "$keyboard${keymap:+:$keymap}${target:+:$target}" |
diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh index a179cef732..4a82890603 100755 --- a/util/docker_cmd.sh +++ b/util/docker_cmd.sh | |||
| @@ -55,5 +55,5 @@ fi | |||
| 55 | $uid_arg \ | 55 | $uid_arg \ |
| 56 | -w /qmk_firmware \ | 56 | -w /qmk_firmware \ |
| 57 | -v "$dir":/qmk_firmware \ | 57 | -v "$dir":/qmk_firmware \ |
| 58 | qmkfm/qmk_cli \ | 58 | ghcr.io/qmk/qmk_cli \ |
| 59 | "$@" | 59 | "$@" |
