From 6fd275c24b4f96a944b43059c855ee6844b35fa9 Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Thu, 10 Jul 2025 21:21:36 -0400 Subject: [PATCH] asd --- .github/workflows/main.yml | 80 +++++++++++++++++++------------------- Makefile | 6 +-- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b357f6..89f1d18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,24 +23,24 @@ jobs: steps: - name: "Checkout project" uses: "actions/checkout@v4" -# - name: "Register binfmt entries" -# if: "matrix.arch != 'native'" -# run: | -# make binfmt-register + - name: "Register binfmt entries" + if: "matrix.arch != 'native'" + run: | + make binfmt-register - name: "Build and save image" run: | make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image" -# - name: "Upload artifacts" -# if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'" -# uses: "actions/upload-artifact@v4" -# with: -# name: "dist-${{ matrix.arch }}" -# path: "./dist/" -# retention-days: 1 + - name: "Upload artifacts" + if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'" + uses: "actions/upload-artifact@v4" + with: + name: "dist-${{ matrix.arch }}" + path: "./dist/" + retention-days: 1 push: name: "Push ${{ matrix.arch }} image" -# if: "startsWith(github.ref, 'refs/tags/v')" + if: "startsWith(github.ref, 'refs/tags/v')" needs: ["build"] runs-on: "ubuntu-latest" permissions: @@ -64,33 +64,31 @@ jobs: run: | make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image" -# push-manifest: -# name: "Push manifest" -# if: "startsWith(github.ref, 'refs/tags/v')" -# needs: ["push"] -# runs-on: "ubuntu-latest" -# permissions: -# contents: "read" -# steps: -# - name: "Checkout project" -# uses: "actions/checkout@v4" -# - name: "Login to Docker Hub" -# uses: "docker/login-action@v3" -# with: -# registry: "docker.io" -# username: "${{ secrets.DOCKERHUB_USERNAME }}" -# password: "${{ secrets.DOCKERHUB_TOKEN }}" -# - name: "Push manifest" -# run: | -# make push-cross-manifest + push-manifest: + name: "Push manifest" + if: "startsWith(github.ref, 'refs/tags/v')" + needs: ["push"] + runs-on: "ubuntu-latest" + permissions: + contents: "read" + steps: + - name: "Checkout project" + uses: "actions/checkout@v4" + - name: "Login to Docker Hub" + uses: "docker/login-action@v3" + with: + registry: "d.lilpenguins.com" + - name: "Push manifest" + run: | + make push-cross-manifest -# publish-github-release: -# name: "Publish GitHub release" -# if: "startsWith(github.ref, 'refs/tags/v')" -# needs: ["push-manifest"] -# runs-on: "ubuntu-latest" -# permissions: -# contents: "write" -# steps: -# - name: "Publish" -# uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68" + publish-github-release: + name: "Publish GitHub release" + if: "startsWith(github.ref, 'refs/tags/v')" + needs: ["push-manifest"] + runs-on: "ubuntu-latest" + permissions: + contents: "write" + steps: + - name: "Publish" + uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68" diff --git a/Makefile b/Makefile index b561f0f..3ca3cd9 100755 --- a/Makefile +++ b/Makefile @@ -197,9 +197,9 @@ push-cross-manifest: ## "binfmt-*" targets ################################################## -#.PHONY: binfmt-register -#binfmt-register: -# '$(DOCKER)' run --rm --privileged docker.io/hectorm/qemu-user-static:latest --reset --persistent yes --credential yes +.PHONY: binfmt-register +binfmt-register: + '$(DOCKER)' run --rm --privileged docker.io/hectorm/qemu-user-static:latest --reset --persistent yes --credential yes ################################################## ## "version" target