diff options
| author | Drashna Jael're <drashna@live.com> | 2021-10-11 20:36:47 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-10-11 20:36:47 -0700 |
| commit | b34675555cbd9a71a797a7ebc2148cbf2e8f0efc (patch) | |
| tree | 2d701310ccd3fc2c603d63536ab4a3c1d9b9381b /.github | |
| parent | bcddde8738dbba48c548f1e3f12a10bbf60a65d8 (diff) | |
| parent | d9e077468ab3446cbd7306a453a73dad2c1403e8 (diff) | |
Merge commit 'd9e077468ab3446cbd7306a453a73dad2c1403e8' into firmware_21
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/api.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/cli.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/develop_api.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/docs.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format.yaml | 14 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 |
6 files changed, 15 insertions, 13 deletions
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index c8d988d0f0..a19667f97e 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -7,11 +7,12 @@ on: paths: - 'keyboards/**' - 'layouts/community/**' + workflow_dispatch: 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 4e64cbcf8c..f0098142c7 100644 --- a/.github/workflows/develop_api.yml +++ b/.github/workflows/develop_api.yml @@ -7,11 +7,12 @@ on: paths: - 'keyboards/**' - 'layouts/community/**' + workflow_dispatch: 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 c17a04a542..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 @@ -31,12 +31,12 @@ jobs: output: ' ' fileOutput: ' ' - - name: Run qmk cformat and qmk pyformat + - name: Run qmk format-c and qmk format-python shell: 'bash {0}' run: | - qmk cformat --core-only -n $(< ~/files.txt) - cformat_exit=$? - qmk pyformat -n - pyformat_exit=$? + qmk format-c --core-only -n $(< ~/files.txt) + format_c_exit=$? + qmk format-python -n + format_python_exit=$? - exit $((cformat_exit + pyformat_exit)) + exit $((format_c_exit + format_python_exit)) 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 |