From 1aeabce71f1cf0d5a5981229942d41b43bac35e8 Mon Sep 17 00:00:00 2001 From: penguin Date: Sat, 20 Dec 2025 17:42:26 -0600 Subject: [PATCH] try redhat actions again --- .gitea/workflows/gentoo-utils.yml | 51 ++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index de3dfc7..30ebf3a 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -65,27 +65,50 @@ jobs: echo "comparison_hash=$comparison_hash" >> $GITEA_OUTPUT echo "build_image=$build_image" >> $GITEA_OUTPUT cat $GITEA_OUTPUT - - name: Set up Docker buildx - if: steps.image-changes.outputs.build_image == 'true' - uses: docker/setup-buildx-action@v3 + # - name: Set up Docker buildx + # if: steps.image-changes.outputs.build_image == '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.build_image == 'true' + # uses: docker/login-action@v3 + # with: + # registry: ${{ vars.REGISTRY_URL }} + # username: ${{ vars.CI_BOT_USERNAME }} + # password: ${{ secrets.CI_BOT_TOKEN }} + + - name: "Buildah: Build image" + id: build-image if: steps.image-changes.outputs.build_image == 'true' - uses: docker/login-action@v3 + uses: redhat-actions/buildah-build@v2 with: + image: ${{ gitea.repository }} + tags: ${{ steps.image-changes.outputs.image_tag }} + context: "{{defaultContext}}:.docker" + containerfiles: | + Dockerfile + + - name: Push OCI image + id: push-image + if: steps.image-changes.outputs.build_image == 'true' + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build-image.outputs.image }} + tags: ${{ steps.build-image.outputs.tags }} registry: ${{ vars.REGISTRY_URL }} username: ${{ vars.CI_BOT_USERNAME }} password: ${{ secrets.CI_BOT_TOKEN }} - - name: Build and push - if: steps.image-changes.outputs.build_image == 'true' - uses: docker/build-push-action@v6 - with: - push: true - tags: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ steps.image-changes.outputs.image_tag }} - context: "{{defaultContext}}:.docker" - cache-from: type=gha - cache-to: type=gha,mode=max + + # - name: Build and push + # if: steps.image-changes.outputs.build_image == 'true' + # uses: docker/build-push-action@v6 + # with: + # push: true + # tags: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ steps.image-changes.outputs.image_tag }} + # context: "{{defaultContext}}:.docker" + # cache-from: type=gha + # cache-to: type=gha,mode=max outputs: image_tag: ${{ steps.image-changes.outputs.image_tag }}