Compare commits

..

No commits in common. "3716172f202b9c0a720dd82f1bd6f4a48e34f5c7" and "926ad823673384678162c23915309cb2522d0b70" have entirely different histories.

View File

@ -27,23 +27,17 @@ jobs:
- name: Checkout Userspace - name: Checkout Userspace
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
path: userspace
submodules: recursive submodules: recursive
- name: Check qmk_firmware exists # This doesn't use actions/checkout as we want to allow qmk_firmware as a submodule
id: check_files
uses: andstor/file-existence-action@v2
with:
files: qmk_firmware
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v3 run: |
if: steps.check_files.outputs.files_exists == 'false' if [ ! -d qmk_firmware ]; then
with: git clone -b ${{ inputs.qmk_ref || 'master' }} \
path: qmk_firmware --depth=1000 --recurse-submodules --shallow-submodules \
repository: ${{ inputs.qmk_repo || 'qmk/qmk_firmware' }} https://github.com/${{ inputs.qmk_repo || 'qmk/qmk_firmware' }}.git
ref: ${{ inputs.qmk_ref || 'master' }} fi
submodules: recursive
fetch-depth: 1000 # This line should be removed once userspace support exists in QMK Firmware
######################################################## ########################################################
## Delete this section once userspace exists upstream ## ## Delete this section once userspace exists upstream ##
@ -67,7 +61,7 @@ jobs:
run: | run: |
qmk config mass_compile.parallel=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) qmk config mass_compile.parallel=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
qmk config user.qmk_home=$GITHUB_WORKSPACE/qmk_firmware qmk config user.qmk_home=$GITHUB_WORKSPACE/qmk_firmware
qmk config user.overlay_dir=$GITHUB_WORKSPACE qmk config user.overlay_dir=$GITHUB_WORKSPACE/userspace
- name: Build - name: Build
run: | run: |
@ -81,14 +75,14 @@ jobs:
- name: Upload binaries - name: Upload binaries
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: always() && !cancelled() if: always()
continue-on-error: true continue-on-error: true
with: with:
name: Firmware name: Firmware
path: | path: |
*.bin userspace/*.bin
*.hex userspace/*.hex
*.uf2 userspace/*.uf2
publish: publish:
name: Publish name: Publish
@ -96,19 +90,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Download binaries - uses: actions/download-artifact@v3
if: always() && !cancelled()
uses: actions/download-artifact@v3
- name: Generate Release - uses: marvinpinto/action-automatic-releases@latest
uses: softprops/action-gh-release@v1 if: always()
if: always() && !cancelled()
with: with:
token: "${{ github.token }}" repo_token: "${{ github.token }}"
name: Latest Firmware automatic_release_tag: "latest"
tag_name: latest title: "Latest Firmware"
fail_on_unmatched_files: false
draft: false
prerelease: false prerelease: false
files: | files: |
**/*.hex **/*.hex