From 5dcc0743f596f97cbae548315b48478ce4d81e47 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 22 Feb 2022 02:57:52 +0000 Subject: Install extra CLI dependencies that are missing (#16425) --- .github/workflows/format.yaml | 1 + .github/workflows/format_push.yaml | 1 + 2 files changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index f1525526ce..9415861eaa 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -22,6 +22,7 @@ jobs: - name: Install dependencies run: | apt-get update && apt-get install -y dos2unix + pip3 install -r requirements-dev.txt - uses: actions/checkout@v2 with: diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml index b79130f17a..5a17a4d65c 100644 --- a/.github/workflows/format_push.yaml +++ b/.github/workflows/format_push.yaml @@ -16,6 +16,7 @@ jobs: - name: Install dependencies run: | apt-get update && apt-get install -y dos2unix + pip3 install -r requirements-dev.txt - uses: actions/checkout@v2 with: -- cgit v1.2.3 From 5330d0888dd10bfbdb55196d0713db344e0c3fbb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 22 Feb 2022 18:24:18 +0000 Subject: Install extra CLI dependencies that are missing (#16426) * Install extra CLI dependencies that are missing * dos2unix is part of base container --- .github/workflows/format.yaml | 9 ++++----- .github/workflows/format_push.yaml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to '.github') diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 9415861eaa..ba0a86aa78 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -19,15 +19,14 @@ jobs: container: qmkfm/qmk_cli steps: - - name: Install dependencies - run: | - apt-get update && apt-get install -y dos2unix - pip3 install -r requirements-dev.txt - - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Install dependencies + run: | + pip3 install -r requirements-dev.txt + - uses: trilom/file-changes-action@v1.2.4 id: file_changes with: diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml index 5a17a4d65c..4b51213b36 100644 --- a/.github/workflows/format_push.yaml +++ b/.github/workflows/format_push.yaml @@ -13,15 +13,14 @@ jobs: container: qmkfm/qmk_cli steps: - - name: Install dependencies - run: | - apt-get update && apt-get install -y dos2unix - pip3 install -r requirements-dev.txt - - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Install dependencies + run: | + pip3 install -r requirements-dev.txt + - name: Run qmk formatters shell: 'bash {0}' run: | -- cgit v1.2.3 From 34ba7f1c18a6924f47947e76b32d7620411d1e7a Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 4 Mar 2022 15:43:55 +1100 Subject: Bug report template: require `qmk doctor` output (#16517) --- .github/ISSUE_TEMPLATE/bug_report.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to '.github') diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 57b415f7b3..81561eaba6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -18,19 +18,18 @@ assignees: '' ## System Information - - Keyboard: - - Revision (if applicable): - - Operating system: - - AVR GCC version: - - - ARM GCC version: - - - QMK Firmware version: - - - Any keyboard related software installed? - - [ ] AutoHotKey - - [ ] Karabiner - - [ ] Other: +**Keyboard:** +**Revision (if applicable):** +**Operating system:** +**`qmk doctor` output:** +``` +(Paste output here) +``` + +**Any keyboard related software installed?** + - [ ] AutoHotKey (Windows) + - [ ] Karabiner (macOS) + - [ ] Other: ## Additional Context -- cgit v1.2.3 From 46e85ded4747fb3d89f107cb098d9054ea5e632c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 15 Mar 2022 12:49:23 +0000 Subject: Add merge workflow for XAP branch (#16652) * Add merge workflow for XAP branch * uncomment --- .github/workflows/develop_update.yml | 8 ------- .github/workflows/feature_branch_update.yml | 34 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/feature_branch_update.yml (limited to '.github') diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml index 285720fefe..1f5c841bff 100644 --- a/.github/workflows/develop_update.yml +++ b/.github/workflows/develop_update.yml @@ -5,7 +5,6 @@ on: branches: - master - jobs: develop_update: runs-on: ubuntu-latest @@ -22,14 +21,7 @@ jobs: git fetch origin master develop git checkout develop - - name: Check if branch locked - id: check_locked - uses: andstor/file-existence-action@v1 - with: - files: ".locked" - - name: Update develop from master - if: steps.check_locked.outputs.files_exists == 'false' run: | git config --global user.name "QMK Bot" git config --global user.email "hello@qmk.fm" diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml new file mode 100644 index 0000000000..fc7bbafd18 --- /dev/null +++ b/.github/workflows/feature_branch_update.yml @@ -0,0 +1,34 @@ +name: Update feature branches after develop merge + +on: + push: + branches: + - develop + +jobs: + feature_branch_update: + runs-on: ubuntu-latest + + if: github.repository == 'qmk/qmk_firmware' + + strategy: + matrix: + branch: + - xap + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Checkout branch + run: | + git fetch origin develop ${{ matrix.branch }} + git checkout ${{ matrix.branch }} + + - name: Update branch from develop + run: | + git config --global user.name "QMK Bot" + git config --global user.email "hello@qmk.fm" + git merge origin/develop + git push origin ${{ matrix.branch }} -- cgit v1.2.3 From 8bffc6195959ceb3a0623595f3d4d5ac072af8c1 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 15 Mar 2022 23:27:55 +0000 Subject: Ensure dependent CI workflows run (#16662) --- .github/workflows/develop_update.yml | 1 + .github/workflows/feature_branch_update.yml | 1 + 2 files changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml index 1f5c841bff..90159406a6 100644 --- a/.github/workflows/develop_update.yml +++ b/.github/workflows/develop_update.yml @@ -14,6 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + token: ${{ secrets.QMK_BOT_TOKEN }} fetch-depth: 0 - name: Checkout develop diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml index fc7bbafd18..98d3616ad1 100644 --- a/.github/workflows/feature_branch_update.yml +++ b/.github/workflows/feature_branch_update.yml @@ -19,6 +19,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + token: ${{ secrets.QMK_BOT_TOKEN }} fetch-depth: 0 - name: Checkout branch -- cgit v1.2.3