Merge pull request #108 from morri-son/enhance-cli-release

Enhance cli release

Author: morri-son

.github/workflows/cli-release.yml

@@ -60,21 +60,18 @@ jobs:
           private-key: ${{ secrets.OCMBOT_PRIV_KEY }}
 
       - name: Checkout Repository
-        # Checkout repository for tagging
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           sparse-checkout: ${{ env.COMPONENT_PATH }}
           ref: ${{ github.event.inputs.branch }}
           token: ${{ steps.get_token.outputs.token }}
 
       - name: Setup git config
-        # Set committer for git identity
         run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
 
-      - name: Create ${{ needs.prepare.outputs.new_tag }}
-        # Create and push tag if not existing
+      - name: Create tag
         id: tag
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         env:
@@ -116,8 +113,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Decode changelog to file
-        # Recreate changelog file from base64 string for release body
+      - name: Decode changelog
         env:
           CHANGELOG_B64: ${{ needs.prepare.outputs.changelog_b64 }}
         run: echo "$CHANGELOG_B64" | base64 --decode > "${{ runner.temp }}/CHANGELOG.md"
@@ -235,32 +231,15 @@ jobs:
     permissions:
       contents: write
       packages: write
-    outputs:
-      set_latest: ${{ steps.promote_oci.outputs.set_latest }}
     steps:
-      - name: Validate release preconditions
-        env:
-          RC_TAG: ${{ needs.prepare.outputs.new_tag }}
-          PROMOTION_TAG: ${{ needs.prepare.outputs.promotion_tag }}
-        run: |
-          if [ -z "$RC_TAG" ]; then
-            echo "::error::Missing RC tag from prepare step"
-            exit 1
-          fi
-          if [ -z "$PROMOTION_TAG" ]; then
-            echo "::error::Missing promotion tag"
-            exit 1
-          fi
-          echo "✅ RC: $RC_TAG → Final: $PROMOTION_TAG"
-
       - name: Generate App Token
         id: get_token
         uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.OCMBOT_APP_ID }}
           private-key: ${{ secrets.OCMBOT_PRIV_KEY }}
 
-      - name: Checkout Repository
+      - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           sparse-checkout: ${{ env.COMPONENT_PATH }}
@@ -273,7 +252,8 @@ jobs:
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
 
-      - name: Create final tag from RC commit
+      - name: Create final tag
+        # Points final tag to same commit as RC tag (no rebuild needed)
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         env:
           RC_TAG: ${{ needs.prepare.outputs.new_tag }}
@@ -282,29 +262,16 @@ jobs:
           github-token: ${{ steps.get_token.outputs.token }}
           script: |
             const { execFileSync } = require("child_process");
-            const rcTag = process.env.RC_TAG;
-            const finalTag = process.env.FINAL_TAG;
-
-            if (!rcTag || !finalTag) {
-              core.setFailed("Missing RC_TAG or FINAL_TAG");
-              return;
-            }
-
-            try {
-              execFileSync("git", ["rev-parse", `refs/tags/${finalTag}`], { stdio: "pipe" });
-              core.setFailed(`Final tag ${finalTag} already exists. Refusing to overwrite immutable tag.`);
-              return;
+            const { RC_TAG: rcTag, FINAL_TAG: finalTag } = process.env;
+            try { 
+              execFileSync("git", ["rev-parse", `refs/tags/${finalTag}`], { stdio: "pipe" }); 
+              core.setFailed(`Tag ${finalTag} already exists`); 
+              return; 
             } catch {}
-
             const rcSha = execFileSync("git", ["rev-parse", `refs/tags/${rcTag}^{commit}`], { stdio: "pipe" }).toString().trim();
-            if (!rcSha) {
-              core.setFailed(`Could not resolve commit for RC tag ${rcTag}`);
-              return;
-            }
-
             execFileSync("git", ["tag", "-a", finalTag, rcSha, "-m", `Promote ${rcTag} to ${finalTag}`]);
             execFileSync("git", ["push", "origin", `refs/tags/${finalTag}`]);
-            core.info(`✅ Created final tag ${finalTag} from ${rcTag} at ${rcSha}`);
+            core.info(`✅ Created final tag ${finalTag} from ${rcTag} (${rcSha.substring(0,7)})`);
 
       - name: Setup ORAS
         uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1
@@ -317,52 +284,19 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Promote OCI image tags
-        id: promote_oci
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         env:
           RC_VERSION: ${{ needs.prepare.outputs.new_version }}
           FINAL_VERSION: ${{ needs.prepare.outputs.promotion_version }}
           TARGET_REPO: ${{ env.REGISTRY }}/${{ github.repository_owner }}/cli
-        with:
-          script: |
-            const { execFileSync } = require('child_process');
-            const { RC_VERSION: rc, FINAL_VERSION: final, TARGET_REPO: repo } = process.env;
-
-            if (!rc || !final) { core.setFailed('Missing RC_VERSION or FINAL_VERSION'); return; }
-
-            // Get highest existing final version from GitHub releases (not OCI)
-            let highest = '';
-            try {
-              const releases = await github.rest.repos.listReleases({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                per_page: 100,
-              });
-              highest = releases.data
-                .filter(r => !r.prerelease && r.tag_name.startsWith('cli/v'))
-                .map(r => r.tag_name.replace('cli/v', ''))
-                .filter(t => /^\d+\.\d+\.\d+$/.test(t))
-                .sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
-                .pop() || '';
-            } catch (e) { core.warning(`Could not fetch existing releases: ${e.message}`); }
-
-            // Set :latest only if this version is >= the current highest
-            const setLatest = !highest || final.localeCompare(highest, undefined, { numeric: true }) >= 0;
-            const tagArgs = setLatest ? [final, "latest"] : [final];
-
-            execFileSync("oras", ["tag", `${repo}:${rc}`, ...tagArgs], { stdio: 'inherit' });
-            core.info(setLatest ? `✅ Tagged :${final} and :latest` : `⚠️ Tagged :${final} (${highest} is higher)`);
-
-            // Export setLatest for use in release_final job
-            core.setOutput('set_latest', setLatest ? 'true' : 'false');
-
-            await core.summary.addHeading('OCI Image Promotion').addTable([
-              [{data: 'Field', header: true}, {data: 'Value', header: true}],
-              ['Source', `${repo}:${rc}`],
-              ['Final', `${repo}:${final}`],
-              ['Highest existing', highest || '(none)'],
-              ['Latest', setLatest ? 'Yes' : `No (${highest} > ${final})`],
-            ]).write();
+          SET_LATEST: ${{ needs.prepare.outputs.set_latest }}
+        run: |
+          if [ "$SET_LATEST" = "true" ]; then
+            oras tag "${TARGET_REPO}:${RC_VERSION}" "${FINAL_VERSION}" "latest"
+            echo "✅ Tagged :${FINAL_VERSION} and :latest"
+          else
+            oras tag "${TARGET_REPO}:${RC_VERSION}" "${FINAL_VERSION}"
+            echo "⚠️ Tagged :${FINAL_VERSION} (not setting :latest)"
+          fi
 
   # --------------------------------------------------------
   # 7. RELEASE FINAL: Create GitHub final release
@@ -405,7 +339,8 @@ jobs:
           TARGET_REPO: ${{ env.REGISTRY }}/${{ github.repository_owner }}/cli
           BINARIES_DIR: ${{ runner.temp }}/binaries
           NOTES_FILE: ${{ runner.temp }}/CHANGELOG.md
-          SET_LATEST: ${{ needs.promote_final.outputs.set_latest }}
+          SET_LATEST: ${{ needs.prepare.outputs.set_latest }}
+          HIGHEST_FINAL_VERSION: ${{ needs.prepare.outputs.highest_final_version }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -467,6 +402,7 @@ jobs:
             }
 
             const releaseUrl = created.data.html_url;
+            const highestFinal = process.env.HIGHEST_FINAL_VERSION || '(none)';
             const ociTags = setLatest
               ? `${targetRepo}:${finalVersion}, ${targetRepo}:latest`
               : `${targetRepo}:${finalVersion}`;
@@ -477,6 +413,7 @@ jobs:
                 [{data: 'Field', header: true}, {data: 'Value', header: true}],
                 ['Final Tag', finalTag],
                 ['Promoted from RC', rcTag],
+                ['Highest Final Version', highestFinal],
                 ['OCI Tags', ociTags],
                 ['GitHub Latest', setLatest ? 'Yes' : 'No (older version)'],
               ])

.github/workflows/release-candidate-version.yml

@@ -30,6 +30,12 @@ on:
       changelog_b64:
         description: "Changelog encoded in base64 for release body"
         value: ${{ jobs.prepare.outputs.changelog_b64 }}
+      set_latest:
+        description: "Whether to set :latest tag (true if this version >= highest existing final)"
+        value: ${{ jobs.prepare.outputs.set_latest }}
+      highest_final_version:
+        description: "Highest existing final version for this component (for logging)"
+        value: ${{ jobs.prepare.outputs.highest_final_version }}
 
 jobs:
   prepare:
@@ -44,6 +50,8 @@ jobs:
       promotion_tag: ${{ steps.compute.outputs.promotion_tag }}
       promotion_version: ${{ steps.compute.outputs.promotion_version }}
       changelog_b64: ${{ steps.summarize.outputs.changelog_b64 }}
+      set_latest: ${{ steps.latest.outputs.set_latest }}
+      highest_final_version: ${{ steps.latest.outputs.highest_final_version }}
     steps:
       # Checkout the repository and target branch
       - name: Checkout Repository
@@ -112,3 +120,56 @@ jobs:
             const encoded = Buffer.from(log).toString("base64");
             core.setOutput("changelog_b64", encoded);
             await core.summary.addRaw(log).write();
+
+      - name: Determine if release should be latest
+        id: latest
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        env:
+          COMPONENT_PATH: ${{ inputs.component_path }}
+          PROMOTION_VERSION: ${{ steps.compute.outputs.promotion_version }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { COMPONENT_PATH: componentPath, PROMOTION_VERSION: promotionVersion } = process.env;
+            
+            // Build tag prefix based on component path
+            const tagPrefix = `${componentPath}/v`;
+            
+            // Find highest existing final version from GitHub releases
+            let highestFinal = '';
+            try {
+              const releases = await github.rest.repos.listReleases({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                per_page: 100,
+              });
+              highestFinal = releases.data
+                .filter(r => !r.prerelease && r.tag_name.startsWith(tagPrefix))
+                .map(r => r.tag_name.replace(tagPrefix, ''))
+                .filter(v => /^\d+\.\d+\.\d+$/.test(v))
+                .sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
+                .pop() || '';
+            } catch (e) {
+              core.warning(`Could not fetch existing releases: ${e.message}`);
+            }
+            
+            // Set :latest only if this version is >= the current highest
+            const setLatest = !highestFinal || promotionVersion.localeCompare(highestFinal, undefined, { numeric: true }) >= 0;
+            
+            core.setOutput('set_latest', setLatest ? 'true' : 'false');
+            core.setOutput('highest_final_version', highestFinal || '(none)');
+            
+            core.info(setLatest
+              ? `✅ Will set :latest (${promotionVersion} >= ${highestFinal || 'none'})`
+              : `⚠️ Will NOT set :latest (${promotionVersion} < ${highestFinal})`);
+            
+            // Add to summary
+            await core.summary
+              .addHeading('Latest Tag Decision', 3)
+              .addTable([
+                [{ data: 'Field', header: true }, { data: 'Value', header: true }],
+                ['Final Version', promotionVersion],
+                ['Highest Final Version', highestFinal || '(none)'],
+                ['Will Set Latest', setLatest ? '✅ Yes' : '⚠️ No'],
+              ])
+              .write();