diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-29 23:42:27 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-29 23:42:27 +0000 |
| commit | 92e606b927ba60a7154857918e2ba16049a880c1 (patch) | |
| tree | bea107b353d60dfa31e0a70a1911430521e14850 /.github | |
| parent | 5fbfab1f3bdb39bb7ae1193e76bd3d57808a3372 (diff) | |
| parent | b705020dafd0aa7531d03cd8fa64260684a3fb79 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/api.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cli.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/develop_api.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/docs.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 07da3f0faf..a19667f97e 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -12,7 +12,7 @@ on: jobs: api_data: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli # protect against those who develop with their fork on master if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index df727518e5..7a8dc8540f 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -16,7 +16,7 @@ jobs: test: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli steps: - uses: actions/checkout@v2 @@ -25,4 +25,4 @@ jobs: - name: Install dependencies run: pip3 install -r requirements-dev.txt - name: Run tests - run: bin/qmk pytest + run: qmk pytest diff --git a/.github/workflows/develop_api.yml b/.github/workflows/develop_api.yml index 45c2ed6be6..f0098142c7 100644 --- a/.github/workflows/develop_api.yml +++ b/.github/workflows/develop_api.yml @@ -12,7 +12,7 @@ on: jobs: api_data: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli # protect against those who work in their fork on develop if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8855d1107f..1ee3ae3964 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ on: jobs: generate: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli # protect against those who develop with their fork on master if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 351c3ff997..0bb8701068 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -16,7 +16,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli steps: - uses: rlespinasse/github-slug-action@v3.x diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cd67de9d8b..c7a8624ee1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/base_container + container: qmkfm/qmk_cli steps: - uses: actions/checkout@v2 |