From 44731beefa8919db1016382f3ab4e13076a3b274 Mon Sep 17 00:00:00 2001 From: penguin Date: Sun, 7 Dec 2025 14:50:28 -0600 Subject: [PATCH 1/4] infra: switch to using generic runner brutalisk and manually specify container image --- .gitea/workflows/gentoo-utils.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index 29abc00..9ee13d6 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -7,7 +7,7 @@ on: branches: [master] jobs: - build-docker: + build-oci-image: runs-on: ubuntu-latest continue-on-error: true steps: @@ -49,8 +49,10 @@ jobs: context: "{{defaultContext}}:.docker" build: - runs-on: gentoo-utils - needs: build-docker + runs-on: brutalisk + container: + image: git.epenguin.net/gentoo-utils/gentoo-utils-gitea:latest + needs: build-oci-image steps: - name: Checkout repo uses: actions/checkout@v5 From 0bff75601cb0856b502c6468dfffdd7851adab34 Mon Sep 17 00:00:00 2001 From: penguin Date: Sun, 7 Dec 2025 14:51:19 -0600 Subject: [PATCH 2/4] infra: add default branch name to outputs --- .gitea/workflows/gentoo-utils.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index 9ee13d6..7dacd2a 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -20,6 +20,7 @@ jobs: - name: Check for changes before building id: image-changes run: | + echo "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITEA_OUTPUT if ! git diff ${{ gitea.event.before }} ${{ gitea.sha }} --no-patch --exit-code .docker; then echo changes_detected=true >> $GITEA_OUTPUT else From b5234652f84d4bab4150fb1641ca914db37493bb Mon Sep 17 00:00:00 2001 From: penguin Date: Sun, 7 Dec 2025 14:51:55 -0600 Subject: [PATCH 3/4] infra: formatting + debug in check changes step --- .gitea/workflows/gentoo-utils.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index 7dacd2a..53e5e52 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -11,8 +11,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - - name: Checkout repo + - name: Checkout repo uses: actions/checkout@v5 with: fetch-depth: 0 @@ -25,9 +24,9 @@ jobs: echo changes_detected=true >> $GITEA_OUTPUT else echo changes_detected=false >> $GITEA_OUTPUT - fi - - - name: Set up Docker buildx + fi + cat $GITEA_OUTPUT + - name: Set up Docker buildx if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/setup-buildx-action@v3 From 98998f5541a869064a2caafcd89eac25f3e898ac Mon Sep 17 00:00:00 2001 From: penguin Date: Sun, 7 Dec 2025 14:47:56 -0600 Subject: [PATCH 4/4] infra: formatting --- .gitea/workflows/gentoo-utils.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index 53e5e52..da4c9d3 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -30,8 +30,7 @@ jobs: if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/setup-buildx-action@v3 - - - name: Log in to Github Container Registry + - name: Log in to Github Container Registry if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/login-action@v3 with: @@ -39,8 +38,7 @@ jobs: username: ${{ vars.CI_BOT_USERNAME }} password: ${{ secrets.CI_BOT_TOKEN }} - - - name: Build and push + - name: Build and push if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/build-push-action@v6 with: