chore(ci): strip old branch names from workflows (#2778)

* chore(ci): strip old branch names from workflows

* fix(ci): use CDK v0.x for CLI prerelease and bundling

Author: nborges-aws

.github/workflows/canary-refactor.yml

@@ -57,7 +57,7 @@ jobs:
     uses: ./.github/workflows/refactor-e2e.yml
     with:
       artifactRef: ${{ needs.resolve_release.outputs.ref }}
-      testRef: refactor
+      testRef: v1.x
       tags: canary
       linuxOnly: true
     secrets:

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: CodeQL
 
 on:
   push:
-    branches: ['v0.x', 'refactor']
+    branches: ['v0.x', 'v1.x']
   pull_request:
-    branches: ['v0.x', 'refactor', 'feat/**']
+    branches: ['v0.x', 'v1.x', 'feat/**']
 
 # Cancel in-progress runs for PRs; never cancel runs on v0.x (merges should not abort each other)
 concurrency:

.github/workflows/e2e-tests-full.yml

@@ -7,7 +7,7 @@ on:
         default: 'us-east-1'
       cdk_branch:
         description: 'Branch of CDK constructs repo to build from'
-        default: 'main'
+        default: 'v0.x'
   push:
     branches: [v0.x, 'feat/**']
 
@@ -92,17 +92,17 @@ jobs:
           skip-token-revoke: true
       - name: Clone CDK repository
         run: |
-          if [ -n "${{ inputs.cdk_branch }}" ] && [ "${{ inputs.cdk_branch }}" != "main" ]; then
+          if [ -n "${{ inputs.cdk_branch }}" ] && [ "${{ inputs.cdk_branch }}" != "v0.x" ]; then
             CDK_BRANCH="${{ inputs.cdk_branch }}"
           elif [ "${{ github.ref_name }}" != "v0.x" ]; then
-            CDK_BRANCH="main"
+            CDK_BRANCH="v0.x"
             REPO_URL="https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git"
             # Check if a branch exists on the CDK repo with the same name
             if git ls-remote --exit-code --heads "$REPO_URL" "${{ github.ref_name }}" > /dev/null 2>&1; then
               CDK_BRANCH="${{ github.ref_name }}"
             fi
           else
-            CDK_BRANCH="main"
+            CDK_BRANCH="v0.x"
           fi
           echo "Using CDK branch: $CDK_BRANCH"
           git clone --depth 1 --branch "$CDK_BRANCH" "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo

.github/workflows/e2e-tests.yml

@@ -6,8 +6,8 @@ on:
         description: 'AWS region for deployment'
         default: 'us-east-1'
       cdk_branch:
-        description: 'CDK repo branch to build from (default: main)'
-        default: 'main'
+        description: 'CDK repo branch to build from (default: v0.x)'
+        default: 'v0.x'
   pull_request_target:
     branches: [v0.x, feat/**]
     # Skip E2E on changes that can't affect agent behavior (e.g. docs-only PRs).
@@ -167,7 +167,7 @@ jobs:
       # Clone CDK repo for bundle script (requires App token for private repo access)
       - name: Clone CDK repo
         run: |
-          CDK_BRANCH="${INPUT_CDK_BRANCH:-main}"
+          CDK_BRANCH="${INPUT_CDK_BRANCH:-v0.x}"
           echo "Cloning CDK from branch: $CDK_BRANCH"
           git clone --depth 1 --branch "$CDK_BRANCH" "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo
           git -C /tmp/cdk-repo remote remove origin

.github/workflows/pr-automation.yml

@@ -2,7 +2,7 @@ name: PR Automation
 
 on:
   pull_request_target:
-    branches: [v0.x, refactor, 'feat/**']
+    branches: [v0.x, v1.x, 'feat/**']
     types: [opened, reopened, edited, synchronize, labeled]
   workflow_dispatch:
     inputs:
@@ -46,7 +46,7 @@ jobs:
     with:
       runner: codebuild
       pr_number: ${{ inputs.pr_number || format('{0}', github.event.pull_request.number) }}
-      allowed_base_branches: '["v0.x","refactor"]'
+      allowed_base_branches: '["v0.x","v1.x"]'
     secrets: inherit
 
   harness-review:

.github/workflows/prerelease-tarball.yml

@@ -35,7 +35,7 @@ jobs:
           owner: aws
       - name: Clone CDK repo
         run: |
-          git clone --depth 1 "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo
+          git clone --depth 1 --branch v0.x "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo
         env:
           CDK_REPO_TOKEN: ${{ steps.app-token.outputs.token }}
           CDK_REPO: ${{ secrets.CDK_REPO_NAME }}

.github/workflows/refactor-e2e.yml

@@ -30,7 +30,7 @@ on:
       artifactRef:
         description: git reference (commit, branch, or tag) to build the CLI from
         type: string
-        default: refactor
+        default: v1.x
       testRef:
         description: git reference (commit, branch, or tag) to run E2E tests from, defaults to artifactRef
         type: string
@@ -46,8 +46,8 @@ on:
 
 concurrency:
   group:
-    e2e-test-${{ inputs.artifactRef || 'refactor' }}-${{ inputs.testRef || inputs.artifactRef || 'refactor' }}-${{
-    inputs.tags || 'all' }}-${{ inputs.linuxOnly && 'linux-only' || 'all-os' }}
+    e2e-test-${{ inputs.artifactRef || 'v1.x' }}-${{ inputs.testRef || inputs.artifactRef || 'v1.x' }}-${{ inputs.tags
+    || 'all' }}-${{ inputs.linuxOnly && 'linux-only' || 'all-os' }}
   cancel-in-progress: false
 
 env:
@@ -110,11 +110,11 @@ jobs:
     steps:
       - uses: actions/checkout@v7
         with:
-          ref: ${{ inputs.testRef || inputs.artifactRef || 'refactor' }}
+          ref: ${{ inputs.testRef || inputs.artifactRef || 'v1.x' }}
           persist-credentials: false
       - uses: actions/checkout@v7
         with:
-          ref: ${{ inputs.artifactRef || 'refactor' }}
+          ref: ${{ inputs.artifactRef || 'v1.x' }}
           path: artifact
           persist-credentials: false
       - uses: oven-sh/setup-bun@v2

scripts/bundle.mjs

@@ -33,6 +33,7 @@ const __dirname = path.dirname(__filename);
 const cliRoot = path.resolve(__dirname, '..');
 
 const CDK_REPO_URL = 'https://github.com/aws/agentcore-l3-cdk-constructs.git';
+const CDK_BRANCH = 'v0.x';
 
 function log(msg) {
   console.log(`\n[bundle] ${msg}`);
@@ -68,15 +69,16 @@ function resolveCdkPath() {
     return sibling;
   }
 
-  // 3. Clone latest from GitHub
+  // 3. Clone the v0 CDK branch from GitHub
   const cloneDir = path.join(cliRoot, '.cdk-constructs-clone');
-  log(`CDK constructs repo not found locally. Cloning latest from GitHub...`);
+  log(`CDK constructs repo not found locally. Cloning ${CDK_BRANCH} from GitHub...`);
 
   if (fs.existsSync(cloneDir)) {
     log('Pulling latest changes...');
-    run('git', ['pull', 'origin', 'main'], { cwd: cloneDir });
+    run('git', ['fetch', '--depth', '1', 'origin', CDK_BRANCH], { cwd: cloneDir });
+    run('git', ['checkout', '--detach', 'FETCH_HEAD'], { cwd: cloneDir });
   } else {
-    run('git', ['clone', '--depth', '1', CDK_REPO_URL, cloneDir]);
+    run('git', ['clone', '--depth', '1', '--branch', CDK_BRANCH, CDK_REPO_URL, cloneDir]);
   }
 
   return cloneDir;