From d39ab3db6822e28d0e7b530f30666672c1734fa1 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:27:10 +0400 Subject: [PATCH 01/14] Just test --- .github/workflows/build.yml | 6 +++--- .gitignore | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1f4ad2..1168b13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ env: jobs: build: name: Build Docker images - runs-on: ubuntu-latest + runs-on: [ubuntu-24.04, ubuntu-24.04-arm] permissions: contents: read packages: write @@ -66,8 +66,8 @@ jobs: with: context: . file: ${{ matrix.image.dockerfile }} - platforms: linux/amd64,linux/arm64 push: true - tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest + tags: | + ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:${{ runner.arch }}-latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.gitignore b/.gitignore index e43b0f9..4befed3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.idea From be9b8aae344bd17d8370bb54b253ef481b19a416 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:36:42 +0400 Subject: [PATCH 02/14] Just test 2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1168b13..7667221 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,13 +26,13 @@ env: jobs: build: name: Build Docker images - runs-on: [ubuntu-24.04, ubuntu-24.04-arm] + runs-on: ${{ matrix.os }} permissions: contents: read packages: write - strategy: matrix: + os: [ubuntu-24.04, ubuntu-24.04-arm] image: - name: clang-20-conan-aui dockerfile: clang-20-conan-aui/Dockerfile From 019d97bd3ac22dcf250d8c6dac559ff3f5862909 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:43:12 +0400 Subject: [PATCH 03/14] Just test 3 --- .github/workflows/build.yml | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7667221..a50faee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: - ".gitignore" concurrency: - group: build + group: build-${{ github.ref }} cancel-in-progress: false env: @@ -40,7 +40,6 @@ jobs: dockerfile: gcc-15-conan-aui/Dockerfile - name: ndk-28b-conan-aui dockerfile: NDK-28b-conan-aui/Dockerfile - steps: - uses: actions/checkout@v4 with: @@ -68,6 +67,35 @@ jobs: file: ${{ matrix.image.dockerfile }} push: true tags: | - ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:${{ runner.arch }}-latest + ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest + # ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:${{ runner.arch }}-latest cache-from: type=gha cache-to: type=gha,mode=max + + #manifest: + # name: Create and push manifest + # runs-on: ubuntu-24.04 + # needs: build + # permissions: + # packages: write + # steps: + # - name: Set lowercase repository owner + # run: | + # echo "REPOSITORY_OWNER_LC=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV + # + # - name: Log in to Container Registry + # uses: docker/login-action@v3 + # with: + # registry: ${{ env.REGISTRY }} + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # + # - name: Create and push manifests + # run: | + # images="clang-20-conan-aui gcc-15-conan-aui ndk-28b-conan-aui" + # for img in $images; do + # docker manifest create ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ + # --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:amd64-latest \ + # --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:arm64-latest + # docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest + # done From 60dd51a6fb754eeb8e074075d5984b77adcc58fc Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:49:31 +0400 Subject: [PATCH 04/14] Just test 4 --- .github/workflows/build.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a50faee..0b9c3b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,14 +25,18 @@ env: jobs: build: - name: Build Docker images - runs-on: ${{ matrix.os }} + name: Build Docker image + runs-on: ${{ matrix.os.name }} permissions: contents: read packages: write strategy: matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm] + os: + - name: ubuntu-24.04 + arch: amd64 + - name: ubuntu-24.04-arm + arch: arm64v8 image: - name: clang-20-conan-aui dockerfile: clang-20-conan-aui/Dockerfile @@ -67,8 +71,7 @@ jobs: file: ${{ matrix.image.dockerfile }} push: true tags: | - ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest - # ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:${{ runner.arch }}-latest + ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} cache-from: type=gha cache-to: type=gha,mode=max From d91304653f9ac9282cab64f87208d049401efe78 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:53:06 +0400 Subject: [PATCH 05/14] Just test 5 --- .github/workflows/build.yml | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b9c3b7..de6731c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,30 +75,30 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max - #manifest: - # name: Create and push manifest - # runs-on: ubuntu-24.04 - # needs: build - # permissions: - # packages: write - # steps: - # - name: Set lowercase repository owner - # run: | - # echo "REPOSITORY_OWNER_LC=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV - # - # - name: Log in to Container Registry - # uses: docker/login-action@v3 - # with: - # registry: ${{ env.REGISTRY }} - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # - # - name: Create and push manifests - # run: | - # images="clang-20-conan-aui gcc-15-conan-aui ndk-28b-conan-aui" - # for img in $images; do - # docker manifest create ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ - # --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:amd64-latest \ - # --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:arm64-latest - # docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest - # done + manifest: + name: Create and push manifest + runs-on: ubuntu-24.04 + needs: build + permissions: + packages: write + steps: + - name: Set lowercase repository owner + run: | + echo "REPOSITORY_OWNER_LC=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV + + - name: Log in to Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Create and push manifests + run: | + images="clang-20-conan-aui gcc-15-conan-aui ndk-28b-conan-aui" + for img in $images; do + docker manifest create ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ + --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-amd64 \ + --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-arm64v8 + docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest + done From 23a120498c301c2b67f5edec90f1ea22cb66b8f3 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:53:51 +0400 Subject: [PATCH 06/14] Just test 6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de6731c..3adf8d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: concurrency: group: build-${{ github.ref }} - cancel-in-progress: false + cancel-in-progress: true env: REGISTRY: ghcr.io From 86726367ed7907488582f77d811cdd2844fa9a72 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Sun, 7 Sep 2025 23:54:43 +0400 Subject: [PATCH 07/14] Just test 7 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3adf8d2..87b92d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: - ".gitignore" concurrency: - group: build-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true env: From e84ff69c9f3166981a7314eb642dfc8bca3a789b Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:04:40 +0400 Subject: [PATCH 08/14] Just test 8 --- .github/workflows/build.yml | 3 +++ NDK-28b-conan-aui/Dockerfile | 3 ++- clang-20-conan-aui/Dockerfile | 3 ++- gcc-15-conan-aui/Dockerfile | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87b92d1..c964c7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,11 +69,14 @@ jobs: with: context: . file: ${{ matrix.image.dockerfile }} + platforms: ${{ matrix.os.platform }} push: true tags: | ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} cache-from: type=gha cache-to: type=gha,mode=max + build-args: | + ARCH=${{ matrix.os.arch }}/ manifest: name: Create and push manifest diff --git a/NDK-28b-conan-aui/Dockerfile b/NDK-28b-conan-aui/Dockerfile index 5ea8be0..c485e86 100644 --- a/NDK-28b-conan-aui/Dockerfile +++ b/NDK-28b-conan-aui/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:25.04 +ARG ARCH= +FROM ${ARCH}ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive diff --git a/clang-20-conan-aui/Dockerfile b/clang-20-conan-aui/Dockerfile index 4d2cf8b..412f557 100644 --- a/clang-20-conan-aui/Dockerfile +++ b/clang-20-conan-aui/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:25.04 +ARG ARCH= +FROM ${ARCH}ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive diff --git a/gcc-15-conan-aui/Dockerfile b/gcc-15-conan-aui/Dockerfile index f7bd1f0..f18b4d7 100644 --- a/gcc-15-conan-aui/Dockerfile +++ b/gcc-15-conan-aui/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:25.04 +ARG ARCH= +FROM ${ARCH}ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive From 1123e23601473f1e19cb99ae29ed03edaaafce86 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:04:55 +0400 Subject: [PATCH 09/14] Just test 9 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c964c7d..5679df5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: with: context: . file: ${{ matrix.image.dockerfile }} - platforms: ${{ matrix.os.platform }} + #platforms: ${{ matrix.os.platform }} push: true tags: | ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} From 56ae6a2821848222a484bcadb37545e53e9a7bed Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:10:32 +0400 Subject: [PATCH 10/14] Just test 10 --- .github/workflows/build.yml | 6 +++--- NDK-28b-conan-aui/Dockerfile | 3 +-- clang-20-conan-aui/Dockerfile | 3 +-- gcc-15-conan-aui/Dockerfile | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5679df5..a906d0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,10 @@ jobs: matrix: os: - name: ubuntu-24.04 + platform: linux/amd64 arch: amd64 - name: ubuntu-24.04-arm + platform: linux/arm64v8 arch: arm64v8 image: - name: clang-20-conan-aui @@ -69,14 +71,12 @@ jobs: with: context: . file: ${{ matrix.image.dockerfile }} - #platforms: ${{ matrix.os.platform }} + platforms: ${{ matrix.os.platform }} push: true tags: | ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} cache-from: type=gha cache-to: type=gha,mode=max - build-args: | - ARCH=${{ matrix.os.arch }}/ manifest: name: Create and push manifest diff --git a/NDK-28b-conan-aui/Dockerfile b/NDK-28b-conan-aui/Dockerfile index c485e86..5ea8be0 100644 --- a/NDK-28b-conan-aui/Dockerfile +++ b/NDK-28b-conan-aui/Dockerfile @@ -1,5 +1,4 @@ -ARG ARCH= -FROM ${ARCH}ubuntu:25.04 +FROM ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive diff --git a/clang-20-conan-aui/Dockerfile b/clang-20-conan-aui/Dockerfile index 412f557..4d2cf8b 100644 --- a/clang-20-conan-aui/Dockerfile +++ b/clang-20-conan-aui/Dockerfile @@ -1,5 +1,4 @@ -ARG ARCH= -FROM ${ARCH}ubuntu:25.04 +FROM ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive diff --git a/gcc-15-conan-aui/Dockerfile b/gcc-15-conan-aui/Dockerfile index f18b4d7..f7bd1f0 100644 --- a/gcc-15-conan-aui/Dockerfile +++ b/gcc-15-conan-aui/Dockerfile @@ -1,5 +1,4 @@ -ARG ARCH= -FROM ${ARCH}ubuntu:25.04 +FROM ubuntu:25.04 ENV DEBIAN_FRONTEND=noninteractive From efdd98d4323bd0f72845059a4d279c4f55f64c84 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:11:45 +0400 Subject: [PATCH 11/14] Just test 11 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a906d0a..a56e037 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,8 @@ jobs: platform: linux/amd64 arch: amd64 - name: ubuntu-24.04-arm - platform: linux/arm64v8 - arch: arm64v8 + platform: linux/arm64 + arch: arm64 image: - name: clang-20-conan-aui dockerfile: clang-20-conan-aui/Dockerfile @@ -102,6 +102,6 @@ jobs: for img in $images; do docker manifest create ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-amd64 \ - --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-arm64v8 + --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-arm64 docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest done From 009ca9ab9676a955d46c474e64b43db63e0d03bb Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:20:42 +0400 Subject: [PATCH 12/14] Just test 12 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a56e037..ab96cc4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,6 +77,7 @@ jobs: ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} cache-from: type=gha cache-to: type=gha,mode=max + provenance: false manifest: name: Create and push manifest From 16e7a3ea8056b5255f668074ce73131c9f920952 Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:23:31 +0400 Subject: [PATCH 13/14] Just test 13 --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab96cc4..94193ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,8 +101,7 @@ jobs: run: | images="clang-20-conan-aui gcc-15-conan-aui ndk-28b-conan-aui" for img in $images; do - docker manifest create ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ - --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-amd64 \ - --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-arm64 - docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest + docker buildx imagetools create -t ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest \ + ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-amd64 \ + ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/$img:latest-arm64 done From 966a5bdf736d7ce418ff03f2ad16f1080e4ecfcd Mon Sep 17 00:00:00 2001 From: Nelonn <42481486+Nelonn@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:43:20 +0400 Subject: [PATCH 14/14] Do not push on pull_request --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94193ce..18d85cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,6 @@ name: Build on: - workflow_dispatch: push: branches: - main @@ -72,7 +71,7 @@ jobs: context: . file: ${{ matrix.image.dockerfile }} platforms: ${{ matrix.os.platform }} - push: true + push: ${{ github.event_name != 'pull_request' }} tags: | ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER_LC }}/${{ matrix.image.name }}:latest-${{ matrix.os.arch }} cache-from: type=gha @@ -80,6 +79,7 @@ jobs: provenance: false manifest: + if: github.event_name != 'pull_request' name: Create and push manifest runs-on: ubuntu-24.04 needs: build