From be463a2060d4dd44cfb4f3a72965390047d385ab Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Thu, 20 Mar 2025 01:47:36 +0100 Subject: [PATCH] WIP: Improve actions --- .gitea/workflows/build.yaml | 47 ++++++++++++++++++++++++++----------- .pre-commit-config.yaml | 1 + 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2534ad5..ae2843c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -15,18 +15,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}} - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=sha - - name: Login to registry uses: docker/login-action@v3 with: @@ -34,14 +22,45 @@ jobs: username: ${{ gitea.actor }} password: ${{ secrets.REGISTRY_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}} + tags: | + type=edge + type=semver,pattern=v{{version}} + type=semver,pattern=v{{major}}.{{minor}} + type=semver,pattern=v{{major}} + type=sha + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and push Docker image - uses: https://github.com/docker/build-push-action@v5 + id: build + uses: docker/build-push-action@v6 with: context: . push: true + load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + - name: Testing 1 + run: | + echo ${{ steps.build.outputs.imageid }} + echo ${{ steps.build.outputs.digest }} + + - name: Testing 2 + run: | + docker image inspect git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}@${{ steps.build.outputs.digest }} + + - name: Generate CRDs + run: | + docker run --rm git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}@${{ steps.build.outputs.digest }} crdgen > ./crds.yaml + cat ./crds.yaml + manifests: name: Publish manifests runs-on: ubuntu-latest @@ -80,4 +99,4 @@ jobs: - name: Tag manifests run: | flux tag artifact oci://git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}/manifests:sha-$(git rev-parse --short HEAD) \ - --tag latest + --tag edge diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d75dab1..0bd36bd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,6 +4,7 @@ repos: hooks: - id: trailing-whitespace - id: end-of-file-fixer + - id: check-yaml - id: check-toml - id: check-added-large-files - id: check-merge-conflict