fix(actions): update CI (#2194)

* fix(create-release-pr): use correct ref in action

GitHub Actions changed the meaning of `pull_request_target`, so that it
now uses the default branch instead of the pull request base, meaning
that `GITHUB_HEAD_REF` would always be `main` instead of `release/x.y`.

This change checks out the repo at `GITHUB_BASE_REF`, then uses
`rev-parse` to determine the name of the branch.

See: https://github.blog/changelog/2025-11-07-actions-pull_request_target-and-environment-branch-protections-changes/#what-is-changing

* fix(release-action): support uploading multiple charms

Author: andogq

.github/actions/create-cut-pr/index.js

@@ -31720,6 +31720,16 @@ class Git {
     async exec(...args) {
         return exec.exec("git", args);
     }
+    /**
+     * Execute the provided git command, and return the output.
+     */
+    async execOutput(...args) {
+        const output = await exec.getExecOutput("git", args);
+        if (output.exitCode !== 0) {
+            throw new Error(`command exited non-zero: ${output.stdout}`);
+        }
+        return output.stdout;
+    }
     /**
      * Set a git config value.
      */
@@ -31774,6 +31784,13 @@ class Git {
         }
         await this.exec("push", ...flags, this.origin, ...branches);
     }
+    /**
+     * Run `rev-parse` on the `HEAD`.
+     */
+    async revParse() {
+        const rev = await this.execOutput("rev-parse", "--abbrev-ref", "HEAD");
+        return rev.trim();
+    }
 }
 
 ;// CONCATENATED MODULE: ./src/lib/github/pull-request.ts
@@ -32211,10 +32228,11 @@ async function createCtx(fallback) {
     }
     const git = new Git();
     await git.configUser();
+    const refName = await git.revParse();
     return {
         octokit,
         core: core,
-        context: Object.assign({ refName: process.env["GITHUB_REF_NAME"] }, github.context),
+        context: Object.assign({ refName }, github.context),
         exec: exec.exec,
         execOutput: exec.getExecOutput,
         repo,

.github/actions/create-release-pr/index.js

@@ -31720,6 +31720,16 @@ class Git {
     async exec(...args) {
         return exec.exec("git", args);
     }
+    /**
+     * Execute the provided git command, and return the output.
+     */
+    async execOutput(...args) {
+        const output = await exec.getExecOutput("git", args);
+        if (output.exitCode !== 0) {
+            throw new Error(`command exited non-zero: ${output.stdout}`);
+        }
+        return output.stdout;
+    }
     /**
      * Set a git config value.
      */
@@ -31774,6 +31784,13 @@ class Git {
         }
         await this.exec("push", ...flags, this.origin, ...branches);
     }
+    /**
+     * Run `rev-parse` on the `HEAD`.
+     */
+    async revParse() {
+        const rev = await this.execOutput("rev-parse", "--abbrev-ref", "HEAD");
+        return rev.trim();
+    }
 }
 
 ;// CONCATENATED MODULE: ./src/lib/github/pull-request.ts
@@ -32211,10 +32228,11 @@ async function createCtx(fallback) {
     }
     const git = new Git();
     await git.configUser();
+    const refName = await git.revParse();
     return {
         octokit,
         core: core,
-        context: Object.assign({ refName: process.env["GITHUB_REF_NAME"] }, github.context),
+        context: Object.assign({ refName }, github.context),
         exec: exec.exec,
         execOutput: exec.getExecOutput,
         repo,

.github/actions/extract-changelog/index.js

@@ -31720,6 +31720,16 @@ class Git {
     async exec(...args) {
         return exec.exec("git", args);
     }
+    /**
+     * Execute the provided git command, and return the output.
+     */
+    async execOutput(...args) {
+        const output = await exec.getExecOutput("git", args);
+        if (output.exitCode !== 0) {
+            throw new Error(`command exited non-zero: ${output.stdout}`);
+        }
+        return output.stdout;
+    }
     /**
      * Set a git config value.
      */
@@ -31774,6 +31784,13 @@ class Git {
         }
         await this.exec("push", ...flags, this.origin, ...branches);
     }
+    /**
+     * Run `rev-parse` on the `HEAD`.
+     */
+    async revParse() {
+        const rev = await this.execOutput("rev-parse", "--abbrev-ref", "HEAD");
+        return rev.trim();
+    }
 }
 
 ;// CONCATENATED MODULE: ./src/lib/github/pull-request.ts
@@ -32211,10 +32228,11 @@ async function createCtx(fallback) {
     }
     const git = new Git();
     await git.configUser();
+    const refName = await git.revParse();
     return {
         octokit,
         core: core,
-        context: Object.assign({ refName: process.env["GITHUB_REF_NAME"] }, github.context),
+        context: Object.assign({ refName }, github.context),
         exec: exec.exec,
         execOutput: exec.getExecOutput,
         repo,

.github/workflows/create-release-pr.yml

@@ -15,7 +15,9 @@ jobs:
     runs-on: "ubuntu-latest"
     if: github.event_name == 'push' || github.event.pull_request.merged == true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.base_ref }}
       - uses: ./.github/actions/create-release-pr
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -125,22 +125,18 @@ jobs:
       - name: Get charm path
         id: post-build
         run: |
-          CHARM_PATH=$(ls -1 charms/${{ matrix.charm-kind }}-charm/*.charm)
+          CHARM_DIR='charms/${{ matrix.charm-kind }}-charm'
 
-          if [ $(echo "$CHARM_PATH" | wc -l) -ne 1 ]; then
-            echo "Multiple charm artifacts found:"
-            echo "$CHARM_PATH"
-            exit 1
-          fi
+          # Concatenate charm paths into a single line with commas
+          BUILT_CHARM_PATHS=$(ls -1 $CHARM_DIR/*.charm | xargs -L1 basename | paste -sd ',' -)
 
-          echo "charm-path=$CHARM_PATH" | tee -a "$GITHUB_OUTPUT"
-          echo "charm-dir=$(dirname $CHARM_PATH)" | tee -a "$GITHUB_OUTPUT"
-          echo "charm-name=$(basename $CHARM_PATH)" | tee -a "$GITHUB_OUTPUT"
+          echo "charm-dir=$CHARM_DIR" | tee -a "$GITHUB_OUTPUT"
+          echo "built-charm-path=$BUILT_CHARM_PATHS" | tee -a "$GITHUB_OUTPUT"
       - name: Save charm artifact
         uses: actions/upload-artifact@v4
         with:
-          name: juju-dashboard-${{ matrix.charm-kind }}.charm
-          path: ${{ steps.post-build.outputs.charm-path }}
+          name: juju-dashboard-${{ matrix.charm-kind }}
+          path: ${{ steps.post-build.outputs.charm-dir }}/*.charm
       - name: Create new tracks, if required
         run: |
           track='${{ needs.pre-release.outputs.track }}'
@@ -165,7 +161,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           channel: "${{ needs.pre-release.outputs.channel }}"
           charm-path: "${{ steps.post-build.outputs.charm-dir }}"
-          built-charm-path: "${{ steps.post-build.outputs.charm-name }}"
+          built-charm-path: "${{ steps.post-build.outputs.built-charm-path }}"
           upload-image: true
           pull-image: false
           charmcraft-channel: latest/stable
@@ -237,12 +233,12 @@ jobs:
       - name: "Download k8s charm artifact"
         uses: actions/download-artifact@v4
         with:
-          name: juju-dashboard-k8s.charm
+          name: juju-dashboard-k8s
           path: release-artifacts
       - name: "Download machine charm artifact"
         uses: actions/download-artifact@v4
         with:
-          name: juju-dashboard-machine.charm
+          name: juju-dashboard-machine
           path: release-artifacts
 
       - name: "Create release"

actions/src/lib/git.ts

@@ -36,6 +36,19 @@ export default class Git {
     return exec.exec("git", args);
   }
 
+  /**
+   * Execute the provided git command, and return the output.
+   */
+  private async execOutput(...args: string[]): Promise<string> {
+    const output = await exec.getExecOutput("git", args);
+
+    if (output.exitCode !== 0) {
+      throw new Error(`command exited non-zero: ${output.stdout}`);
+    }
+
+    return output.stdout;
+  }
+
   /**
    * Set a git config value.
    */
@@ -117,4 +130,12 @@ export default class Git {
 
     await this.exec("push", ...flags, this.origin, ...branches);
   }
+
+  /**
+   * Run `rev-parse` on the `HEAD`.
+   */
+  async revParse(): Promise<string> {
+    const rev = await this.execOutput("rev-parse", "--abbrev-ref", "HEAD");
+    return rev.trim();
+  }
 }

actions/src/lib/index.ts

@@ -54,13 +54,12 @@ export async function createCtx(fallback?: {
   const git = new Git();
   await git.configUser();
 
+  const refName = await git.revParse();
+
   return {
     octokit,
     core,
-    context: Object.assign(
-      { refName: process.env["GITHUB_REF_NAME"] },
-      github.context,
-    ),
+    context: Object.assign({ refName }, github.context),
     exec: exec.exec,
     execOutput: exec.getExecOutput,
     repo,