From ef1eef1674d71af143d5e8fe452bbf53a06ddc51 Mon Sep 17 00:00:00 2001 From: maurice Date: Fri, 28 Aug 2026 16:53:24 +0200 Subject: [PATCH] Update --- .gitea/workflows/build.yaml | 82 ++++--------------------------------- .gitea/workflows/other.yaml | 40 ------------------ 2 files changed, 9 insertions(+), 113 deletions(-) delete mode 100644 .gitea/workflows/other.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 503e062..cba0fc9 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,34 +1,18 @@ -name: Build containers +name: Build container on: workflow_dispatch: push: branches: ["main"] - paths: ["containers/**", ".gitea/workflows/build.yaml"] + paths: ["container/**", ".gitea/workflows/build.yaml"] pull_request: branches: ["main"] - paths: ["containers/**", ".gitea/workflows/build.yaml"] + paths: ["container/**", ".gitea/workflows/build.yaml"] jobs: - changes: - runs-on: job-v2 - outputs: - any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}} - base: ${{ steps.filter.outputs.base == 'true' }} - steps: - - uses: actions/checkout@v4 - - uses: https://github.com/dorny/paths-filter@v3 - id: filter - with: - filters: | - workflow: ['.gitea/workflows/build.yaml'] - base: ['containers/base/**'] - - base-image: - needs: [changes] - if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }} + build: runs-on: job-v2 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Log in uses: redhat-actions/podman-login@v1 with: @@ -39,10 +23,11 @@ jobs: id: build uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef with: - image: maurice/base + image: maurice/devc tags: ${{ github.ref_name }} - context: ./containers/base - containerfiles: ./containers/base/Containerfile + context: ./container + containerfiles: ./container/Containerfile + platforms: linux/amd64 - name: Push uses: redhat-actions/push-to-registry@v2 with: @@ -54,52 +39,3 @@ jobs: extra-args: | --compression-format=zstd --compression-level=12 - - # dependent-images: - # needs: [changes, base-image] - # if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped') - # runs-on: job-v2 - # strategy: - # fail-fast: false - # matrix: - # container: [rust, dotnet, go] - # steps: - # - name: Check if build needed - # id: check - # run: | - # if [[ "${{ matrix.container }}" == "go" && "${{ needs.changes.outputs.go }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi - # if [[ "${{ matrix.container }}" == "rust" && "${{ needs.changes.outputs.rust }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi - # if [[ "${{ matrix.container }}" == "dotnet" && "${{ needs.changes.outputs.dotnet }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi - # if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi - # - name: Clone repo - # if: steps.check.outputs.run == 'true' - # uses: actions/checkout@v4 - # - name: Log in - # if: steps.check.outputs.run == 'true' - # uses: redhat-actions/podman-login@v1 - # with: - # registry: git.plabble.org - # username: ${{ secrets.REGISTRY_USERNAME }} - # password: ${{ secrets.REGISTRY_TOKEN }} - # - name: Build - # id: build - # if: steps.check.outputs.run == 'true' - # uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef - # with: - # image: maurice/${{ matrix.container }} - # tags: ${{ github.ref_name }} - # context: ./containers/${{ matrix.container }} - # containerfiles: ./containers/${{ matrix.container }}/Containerfile - # build-args: TAG=${{ github.ref_name }} - # - name: Push - # if: steps.check.outputs.run == 'true' - # uses: redhat-actions/push-to-registry@v2 - # with: - # image: ${{ steps.build.outputs.image }} - # tags: ${{ steps.build.outputs.tags }} - # registry: git.plabble.org - # username: ${{ secrets.REGISTRY_USERNAME }} - # password: ${{ secrets.REGISTRY_TOKEN }} - # extra-args: | - # --compression-format=zstd - # --compression-level=12 diff --git a/.gitea/workflows/other.yaml b/.gitea/workflows/other.yaml deleted file mode 100644 index 6b15d84..0000000 --- a/.gitea/workflows/other.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build optional dev containers -on: - workflow_dispatch: - -jobs: - fedora-build: - runs-on: job-v2 - strategy: - max-parallel: 1 - matrix: - container: [rider] - steps: - - name: Clone repo - uses: actions/checkout@v4 - - name: Log in - uses: redhat-actions/podman-login@v1 - with: - registry: git.plabble.org - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_TOKEN }} - - name: Build ${{ matrix.container }} container - id: build_image - uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef - with: - image: maurice/${{ matrix.container }} - tags: ${{ github.ref_name }} - context: ./containers/${{ matrix.container }} - containerfiles: ./containers/${{ matrix.container }}/Containerfile - build-args: TAG=${{ github.ref_name }} - - name: Push ${{ matrix.container }} container - uses: redhat-actions/push-to-registry@v2 - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} - registry: git.plabble.org - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_TOKEN }} - extra-args: | - --compression-format=zstd - --compression-level=12