From f567af24abfbe83f8ca9c118da5561c1b7ef5308 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 22:18:51 +0100 Subject: [PATCH 1/6] ci: Upload binaries as artifacts --- .forgejo/workflows/release-image.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index 170fe668..4ecc803f 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -204,13 +204,28 @@ jobs: digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" + - name: Extract binary from container + run: | + mkdir -p /tmp/binaries + digest="${{ steps.build.outputs.digest }}" + container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest) + docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }} + docker rm -v $container_id + + - name: Upload binary artifact + uses: https://code.forgejo.org/actions/upload-artifact@v4 + with: + name: conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}" + path: /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}" + if-no-files-found: error + - name: Upload digest uses: forgejo/upload-artifact@v4 with: name: digests-${{ matrix.slug }} path: /tmp/digests/* if-no-files-found: error - retention-days: 1 + retention-days: 5 merge: runs-on: dind From 928b7c5e4a8d30c53941703fabf4467d17df412c Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 22:57:33 +0100 Subject: [PATCH 2/6] fix: Correct vars --- .forgejo/workflows/mirror-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/mirror-images.yml b/.forgejo/workflows/mirror-images.yml index 51f60e75..198832db 100644 --- a/.forgejo/workflows/mirror-images.yml +++ b/.forgejo/workflows/mirror-images.yml @@ -20,9 +20,9 @@ jobs: mirror-images: runs-on: ubuntu-latest env: - BUILTIN_REGISTRY_USER: ${{ secrets.BUILTIN_REGISTRY_USER }} + BUILTIN_REGISTRY_USER: ${{ vars.BUILTIN_REGISTRY_USER }} BUILTIN_REGISTRY_PASSWORD: ${{ secrets.BUILTIN_REGISTRY_PASSWORD }} - GITLAB_USERNAME: ${{ secrets.GITLAB_USERNAME }} + GITLAB_USERNAME: ${{ vars.GITLAB_USERNAME }} GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }} steps: - name: Checkout repository From 35f10d6c2bbfc2fcee09eec76873c4006e29fc86 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 22:18:51 +0100 Subject: [PATCH 3/6] ci: Upload binaries as artifacts --- .forgejo/workflows/release-image.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index 170fe668..4ecc803f 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -204,13 +204,28 @@ jobs: digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" + - name: Extract binary from container + run: | + mkdir -p /tmp/binaries + digest="${{ steps.build.outputs.digest }}" + container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest) + docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }} + docker rm -v $container_id + + - name: Upload binary artifact + uses: https://code.forgejo.org/actions/upload-artifact@v4 + with: + name: conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}" + path: /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}" + if-no-files-found: error + - name: Upload digest uses: forgejo/upload-artifact@v4 with: name: digests-${{ matrix.slug }} path: /tmp/digests/* if-no-files-found: error - retention-days: 1 + retention-days: 5 merge: runs-on: dind From 3d098be6d15965e094f9121df06d8fe68c110e0f Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 23:19:04 +0100 Subject: [PATCH 4/6] fixup! ci: Upload binaries as artifacts --- .forgejo/workflows/release-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index 4ecc803f..1cd9b9d6 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -209,8 +209,8 @@ jobs: mkdir -p /tmp/binaries digest="${{ steps.build.outputs.digest }}" container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest) - docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }} - docker rm -v $container_id + res=$(docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}) + rm_res=$(docker rm -v $container_id) - name: Upload binary artifact uses: https://code.forgejo.org/actions/upload-artifact@v4 From 1bdab1960ab718995c5369c7a4f51af5904ccc68 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 23:20:01 +0100 Subject: [PATCH 5/6] ci: Mirror RC tags --- .forgejo/regsync/regsync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/regsync/regsync.yml b/.forgejo/regsync/regsync.yml index 0a14db45..941c0f93 100644 --- a/.forgejo/regsync/regsync.yml +++ b/.forgejo/regsync/regsync.yml @@ -7,14 +7,14 @@ x-tags: tags: allow: - "latest" - - "v[0-9]+\\.[0-9]+\\.[0-9]+" + - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?" - "v[0-9]+\\.[0-9]+" - "v[0-9]+" main: &tags-main tags: allow: - "latest" - - "v[0-9]+\\.[0-9]+\\.[0-9]+" + - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?" - "v[0-9]+\\.[0-9]+" - "v[0-9]+" - "main" @@ -22,7 +22,7 @@ x-tags: tags: allow: - "latest" - - "v[0-9]+\\.[0-9]+\\.[0-9]+" + - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?" - "v[0-9]+\\.[0-9]+" - "v[0-9]+" - "main" From 562d933775a24f8d39b074e126d8326d325d4293 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sun, 6 Jul 2025 23:43:49 +0100 Subject: [PATCH 6/6] ci: Debug --- .forgejo/workflows/release-image.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index 1cd9b9d6..10303232 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -204,13 +204,16 @@ jobs: digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - - name: Extract binary from container + - name: Extract binary from container (image) + id: extract-binary-image run: | mkdir -p /tmp/binaries digest="${{ steps.build.outputs.digest }}" - container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest) - res=$(docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}) - rm_res=$(docker rm -v $container_id) + echo "container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest)" >> $GITHUB_OUTPUT + - name: Extract binary from container (copy) + run: docker cp ${{ steps.extract-binary-image.outputs.container_id }}:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }} + - name: Extract binary from container (cleanup) + run: docker rm ${{ steps.extract-binary-image.outputs.container_id }} - name: Upload binary artifact uses: https://code.forgejo.org/actions/upload-artifact@v4