From 6ab888b4c2e06e97eac5b5f89318bd7356da10e5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Jan 2026 22:37:20 +0900 Subject: [PATCH 1/3] fix(ci/cd): added missing -v parameter in the alchemist --- .github/workflows/build_components.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_components.yml b/.github/workflows/build_components.yml index 36558244..07bd3674 100644 --- a/.github/workflows/build_components.yml +++ b/.github/workflows/build_components.yml @@ -263,7 +263,12 @@ jobs: run: | # Use the component name provided in the matrix entry echo "artifact_name=${{ matrix.recipe.component }}" >> $GITHUB_ENV - automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}" + if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then + # Force rebuild on main using pinned desired_versions.sh + automation-tools/alchemist/alchemist.sh -v automation-tools/alchemist/desired_versions.sh -f "${{ matrix.recipe.recipe }}" + else + automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}" + fi - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -408,7 +413,12 @@ jobs: run: | # Use the component name provided in the matrix entry echo "artifact_name=${{ matrix.recipe.component }}" >> $GITHUB_ENV - automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}" + if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then + # Force rebuild on main using pinned desired_versions.sh + automation-tools/alchemist/alchemist.sh -v automation-tools/alchemist/desired_versions.sh -f "${{ matrix.recipe.recipe }}" + else + automation-tools/alchemist/alchemist.sh -f "${{ matrix.recipe.recipe }}" + fi - name: Upload Artifacts uses: actions/upload-artifact@v4 From a40c23c29fa8b044559bf8a9b7d5f9c9c3d1df13 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Jan 2026 23:05:15 +0900 Subject: [PATCH 2/3] fix(build): avoid to publish draft releases for components repo --- .github/workflows/build_components.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_components.yml b/.github/workflows/build_components.yml index 07bd3674..208d3bcc 100644 --- a/.github/workflows/build_components.yml +++ b/.github/workflows/build_components.yml @@ -723,6 +723,7 @@ jobs: makeLatest: ${{ env.MAKE_LATEST }} repo: ${{ env.REPO_NAME }} token: ${{ steps.generate-rekku-token.outputs.token }} + draft: false - name: Update latest-cooker tag if: github.ref != 'refs/heads/main' From 053fd50ea5d7ed1094ea8f5e54fab1697a362399 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 8 Jan 2026 23:32:04 +0900 Subject: [PATCH 3/3] fix(release): rewrite tag handling for main branch to ensure tag existence before publishing --- .github/workflows/build_components.yml | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_components.yml b/.github/workflows/build_components.yml index 208d3bcc..a1cbdd13 100644 --- a/.github/workflows/build_components.yml +++ b/.github/workflows/build_components.yml @@ -711,6 +711,20 @@ jobs: echo "TAG=$TAG" >> $GITHUB_OUTPUT echo "MAKE_LATEST=$MAKE_LATEST" >> $GITHUB_OUTPUT + - name: Rewrite Tag (main only, ensure tag exists before Publish) + if: github.ref == 'refs/heads/main' + run: | + git submodule deinit -f --all + git fetch --tags + if git rev-parse --verify "${{ env.TAG }}" >/dev/null 2>&1; then + git tag -d "${{ env.TAG }}" || true + git push --delete origin "${{ env.TAG }}" || true + fi + git tag "${{ env.TAG }}" + git push origin "${{ env.TAG }}" + env: + GITHUB_TOKEN: ${{ steps.generate-rekku-token.outputs.token }} + - name: Publish release uses: ncipollo/release-action@v1 with: @@ -810,17 +824,4 @@ jobs: GITHUB_TOKEN: ${{ steps.generate-rekku-token.outputs.token }} header: "RetroDECK Build Artifacts" path: pr_body.md - - - name: Rewrite Tag - if: github.ref == 'refs/heads/main' - run: | - git submodule deinit -f --all - git fetch --tags - if git rev-parse --verify "${{ env.TAG }}" >/dev/null 2>&1; then - git tag -d "${{ env.TAG }}" - git push --delete origin "${{ env.TAG }}" - fi - git tag "${{ env.TAG }}" - git push origin "${{ env.TAG }}" - env: - GITHUB_TOKEN: ${{ steps.generate-rekku-token.outputs.token }} \ No newline at end of file + \ No newline at end of file