From 103a31736b08f5c298a2b970ad30fe922ec213ef Mon Sep 17 00:00:00 2001 From: Dave Vigil Date: Tue, 15 Jul 2025 00:27:50 -0500 Subject: [PATCH] Fixing git workflow build --- .github/workflows/docker-build.yml | 53 ++---------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 00351b3..aede46d 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -4,6 +4,8 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest + container: + image: ubuntu strategy: matrix: keyboard: [draculad, iris, scottogame, sweep, swoop] @@ -31,54 +33,3 @@ jobs: run: docker tag qmk-builder registry.home.dgvigil.dev/qmk-builder:v0.1 - name: Push Docker image run: docker push registry.home.dgvigil.dev/qmk-builder:v0.1 - - - name: Build firmware - run: | - docker run --rm \ - -v "${{ github.workspace }}:/workspace" \ - -w /workspace \ - -e USER=dgvigil \ - qmk-builder \ - bash -c " - cd /qmk_firmware - qmk compile -kb ${{ matrix.qmk_path }} -km dgvigil - " - - - name: Upload firmware artifacts - uses: actions/upload-artifact@v4 - with: - name: firmware-${{ matrix.keyboard }} - path: qmk_firmware/*.hex - retention-days: 30 - - - name: Upload UF2 files - uses: actions/upload-artifact@v4 - with: - name: firmware-${{ matrix.keyboard }}-uf2 - path: qmk_firmware/*.uf2 - retention-days: 30 - - release: - needs: build - runs-on: ubuntu-latest - if: github.event_name == 'push' && github.ref == 'refs/heads/main' - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Download all artifacts - uses: actions/download-artifact@v4 - with: - path: artifacts - - - name: Create release - uses: marvinpinto/action-automatic-releases@latest - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "${{ github.sha }}" - title: "QMK Firmware Build - ${{ github.sha }}" - prerelease: false - files: | - artifacts/**/*.hex - artifacts/**/*.uf2 \ No newline at end of file