From c7f58145fb8cf5ea4337a1bb0439111fe2ce65f0 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 17 Mar 2023 01:32:09 +0000 Subject: [PATCH] Update qmk_cli container references (#20154) --- .github/workflows/api.yml | 2 +- .github/workflows/ci_builds.yml | 2 +- .github/workflows/cli.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/format_push.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/regen.yml | 2 +- .github/workflows/regen_push.yml | 2 +- .github/workflows/unit_test.yml | 2 +- Dockerfile | 6 ------ docs/newbs_building_firmware_workflow.md | 2 +- util/docker_build.sh | 2 +- util/docker_cmd.sh | 2 +- 14 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 Dockerfile diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 2abfe696fd77307cee8dfcb0bee7a5bd782c5652..38c1cfe50691017733b90955860a8d400ad76a78 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -19,7 +19,7 @@ on: jobs: api_data: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli # protect against those who work in their fork on 'important' branches if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml index e2bbd9349763797db31567a26d78e60a650dec8a..787a73a8080d1af057b8239455b0750225e8f939 100644 --- a/.github/workflows/ci_builds.yml +++ b/.github/workflows/ci_builds.yml @@ -22,7 +22,7 @@ jobs: keymap: [default, via] 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] - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index d98692e6d94adf6e14ea04cea55e1e6a0d7f8142..27bdcc562b78e51d6311310882f5142967c3f9dc 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -18,7 +18,7 @@ jobs: test: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 841573cf30ea0f2aec84a91b5ff7c00a10f6b519..923dfc1c1b7c84af005797808e41c7064644beba 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,7 +17,7 @@ on: jobs: generate: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli # protect against those who develop with their fork on master if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 78aaae8a0eb35d507fe44165baafb067ee97a84c..8ecdf82059d4c6fce7d163be3c1e739f9ead1b91 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,7 +19,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml index 26e9f4edfb02d1bc843e966bd699f7792fd2a554..25655f33b746b28c4d9ed8de978a9c934440e7f5 100644 --- a/.github/workflows/format_push.yml +++ b/.github/workflows/format_push.yml @@ -13,7 +13,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6b4e266bdea4e2a52654b547e36a4e9e06de7a92..91932b323a4d5a7e9c7aa43b7a72dc6530677d57 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml index f301000d55e9f6cf1872a1a0371dff6cfe24e0d6..a2b4ef2b934bde18190caad3f59b0057d45418a2 100644 --- a/.github/workflows/regen.yml +++ b/.github/workflows/regen.yml @@ -13,7 +13,7 @@ jobs: regen: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml index c56bc48a690cbc79fc64c5a1d004c0ca1dc03056..b8197263a6bf09efb4d27aebbd3269ae96a956cb 100644 --- a/.github/workflows/regen_push.yml +++ b/.github/workflows/regen_push.yml @@ -13,7 +13,7 @@ jobs: regen: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 75ed84177bf0b4b496a706f22f60b2790f974e7c..fb538d4f841cd58ac41de13ea7ebc827f0776e6a 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -23,7 +23,7 @@ jobs: test: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e283c8f98a3d470f75927cd2ed6017c565a8ca44..0000000000000000000000000000000000000000 --- a/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM qmkfm/qmk_cli - -VOLUME /qmk_firmware -WORKDIR /qmk_firmware - -CMD qmk compile -kb all -km default diff --git a/docs/newbs_building_firmware_workflow.md b/docs/newbs_building_firmware_workflow.md index e6895252aa55fc64e040e6584195551ad47ee802..51ce30490131fe5a0b1a1e8984c54ff2bf11df3d 100644 --- a/docs/newbs_building_firmware_workflow.md +++ b/docs/newbs_building_firmware_workflow.md @@ -95,7 +95,7 @@ on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli strategy: fail-fast: false matrix: diff --git a/util/docker_build.sh b/util/docker_build.sh index 8dce38732064324f00241c369f164b3ca6b72e27..828b5751af5313be14ca7384d875b9b5ca4312bc 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -81,5 +81,5 @@ fi -e ALT_GET_KEYBOARDS=true \ -e SKIP_GIT="$SKIP_GIT" \ -e MAKEFLAGS="$MAKEFLAGS" \ - qmkfm/qmk_cli \ + ghcr.io/qmk/qmk_cli \ make "$keyboard${keymap:+:$keymap}${target:+:$target}" diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh index a179cef732cef445f2bc89a5b8dc8662d6a2d0f3..4a82890603b8ade1e29a87c06faef6026135e9d7 100755 --- a/util/docker_cmd.sh +++ b/util/docker_cmd.sh @@ -55,5 +55,5 @@ fi $uid_arg \ -w /qmk_firmware \ -v "$dir":/qmk_firmware \ - qmkfm/qmk_cli \ + ghcr.io/qmk/qmk_cli \ "$@"