summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /.github
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to '.github')
-rw-r--r--.github/dependabot.yml9
-rw-r--r--.github/workflows/api.yml5
-rw-r--r--.github/workflows/auto_tag.yml4
-rw-r--r--.github/workflows/cli.yml2
-rw-r--r--.github/workflows/develop_api.yml5
-rw-r--r--.github/workflows/develop_update.yml6
-rw-r--r--.github/workflows/docs.yml4
-rw-r--r--.github/workflows/feature_branch_update.yml6
-rw-r--r--.github/workflows/format.yml2
-rw-r--r--.github/workflows/format_push.yml8
-rw-r--r--.github/workflows/lint.yml2
-rw-r--r--.github/workflows/stale.yml2
-rw-r--r--.github/workflows/unit_test.yml2
13 files changed, 42 insertions, 15 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..562d671c8e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ labels: CI
+ reviewers:
+ - "qmk/collaborators"
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index f0c49baf60..dd3fbdaa92 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -7,6 +7,9 @@ on:
paths:
- 'keyboards/**'
- 'layouts/community/**'
+ - 'lib/python/**'
+ - 'data/**'
+ - '.github/workflows/api.yml'
workflow_dispatch:
jobs:
@@ -18,7 +21,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 1
persist-credentials: false
diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 29e85c41ca..6205dbe11c 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -22,12 +22,12 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Bump version and push tag
- uses: anothrNick/github-tag-action@1.26.0
+ uses: anothrNick/github-tag-action@1.46.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 2ea810958b..72f2ea293a 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -18,7 +18,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies
diff --git a/.github/workflows/develop_api.yml b/.github/workflows/develop_api.yml
index 44d259cfac..194305e730 100644
--- a/.github/workflows/develop_api.yml
+++ b/.github/workflows/develop_api.yml
@@ -7,6 +7,9 @@ on:
paths:
- 'keyboards/**'
- 'layouts/community/**'
+ - 'lib/python/**'
+ - 'data/**'
+ - '.github/workflows/develop_api.yml'
workflow_dispatch:
jobs:
@@ -18,7 +21,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 1
persist-credentials: false
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 90159406a6..18ca84162b 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -12,11 +12,15 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
+ - name: Disable automatic eol conversion
+ run: |
+ echo "* -text" > .git/info/attributes
+
- name: Checkout develop
run: |
git fetch origin master develop
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 1ee3ae3964..691770a5af 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -20,7 +20,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 1
@@ -34,7 +34,7 @@ jobs:
qmk --verbose generate-docs
- name: Deploy
- uses: JamesIves/github-pages-deploy-action@3.7.1
+ uses: JamesIves/github-pages-deploy-action@v4.4.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE_BRANCH: master
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
index 98d3616ad1..90cd85e355 100644
--- a/.github/workflows/feature_branch_update.yml
+++ b/.github/workflows/feature_branch_update.yml
@@ -17,11 +17,15 @@ jobs:
- xap
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0
+ - name: Disable automatic eol conversion
+ run: |
+ echo "* -text" > .git/info/attributes
+
- name: Checkout branch
run: |
git fetch origin develop ${{ matrix.branch }}
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index ba0a86aa78..b6ce4063fe 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -19,7 +19,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
index 4b51213b36..910bba9a4e 100644
--- a/.github/workflows/format_push.yml
+++ b/.github/workflows/format_push.yml
@@ -13,10 +13,14 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
+ - name: Disable automatic eol conversion
+ run: |
+ echo "* -text" > .git/info/attributes
+
- name: Install dependencies
run: |
pip3 install -r requirements-dev.txt
@@ -37,7 +41,7 @@ jobs:
git config user.email 'hello@qmk.fm'
- name: Create Pull Request
- uses: peter-evans/create-pull-request@v3
+ uses: peter-evans/create-pull-request@v4
if: ${{ github.repository == 'qmk/qmk_firmware'}}
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ab694ee668..5b8a45f26b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b15f301865..297af8e19c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- - uses: actions/stale@v5
+ - uses: actions/stale@v6
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 6afe29e04f..c8373441ff 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -23,7 +23,7 @@ jobs:
container: qmkfm/qmk_cli
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
submodules: recursive
- name: Install dependencies