pr clean up

.github/workflows/bundle-size.yml

@@ -30,13 +30,15 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: 'Configure npm for GitHub Packages'
-        run: |
-          echo "@google-gemini:registry=https://npm.pkg.github.com/" > .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc
+      - name: 'Setup NPMRC'
+        uses: './.github/actions/setup-npmrc'
+        with:
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: 'Install dependencies'
-        run: 'npm install @google-gemini/gemini-cli@${{ inputs.version }}'
+        env:
+          VERSION: '${{ inputs.version }}'
+        run: 'npm install @google-gemini/gemini-cli@${{ env.VERSION }}'
 
       - name: 'Check Bundle Size'
         uses: 'preactjs/compressed-size-action@946a292cd35bd1088e0d7eb92b69d1a8d5b5d76a'

.github/workflows/e2e.yml

@@ -21,11 +21,11 @@ jobs:
   e2e_linux:
     name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
     if: |
-      (github.event_name == 'push' ||
+      github.event_name == 'push' ||
       github.event_name == 'merge_group' ||
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
+      github.event.pull_request.head.repo.full_name == github.repository ||
+      github.event.label.name == 'maintainer:e2e:ok'
     runs-on: 'gemini-cli-ubuntu-16-core'
     strategy:
       fail-fast: false
@@ -65,7 +65,10 @@ jobs:
         run: 'docker pull ${{ inputs.image-uri }}'
 
       - name: 'Install dependencies'
-        run: 'npm install ${{ inputs.cli-package-name }}@${{ inputs.version }}'
+        env:
+          CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+          VERSION: '${{ inputs.version }}'
+        run: 'npm install ${{ env.CLI_PACKAGE_NAME }}@${{ env.VERSION }}'
 
       - name: 'Run E2E tests'
         env:
@@ -85,11 +88,11 @@ jobs:
   e2e_mac:
     name: 'E2E Test (macOS)'
     if: |
-      (github.event_name == 'push' ||
+      github.event_name == 'push' ||
       github.event_name == 'merge_group' ||
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
+      github.event.pull_request.head.repo.full_name == github.repository ||
+      github.event.label.name == 'maintainer:e2e:ok'
     runs-on: 'macos-latest'
     steps:
       - name: 'Checkout (fork)'
@@ -116,7 +119,10 @@ jobs:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: 'Install dependencies'
-        run: 'npm install @google-gemini/gemini-cli@${{ inputs.version }}'
+        env:
+          CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+          VERSION: '${{ inputs.version }}'
+        run: 'npm install ${{ env.CLI_PACKAGE_NAME }}@${{ env.VERSION }}'
 
       - name: 'Fix rollup optional dependencies on macOS'
         if: "runner.os == 'macOS'"
@@ -135,11 +141,11 @@ jobs:
   e2e_windows:
     name: 'Slow E2E - Win'
     if: |
-      (github.event_name == 'push' ||
+      github.event_name == 'push' ||
       github.event_name == 'merge_group' ||
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
+      github.event.pull_request.head.repo.full_name == github.repository ||
+      github.event.label.name == 'maintainer:e2e:ok'
     runs-on: 'gemini-cli-windows-16-core'
     continue-on-error: true
 
@@ -187,7 +193,10 @@ jobs:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: 'Install dependencies'
-        run: 'npm install ${{ inputs.cli-package-name }}@${{ inputs.version }}'
+        env:
+          CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+          VERSION: '${{ inputs.version }}'
+        run: 'npm install ${{ env.CLI_PACKAGE_NAME }}@${{ env.VERSION }}'
         shell: 'pwsh'
 
       - name: 'Run E2E tests'
@@ -210,8 +219,8 @@ jobs:
         github.event_name == 'push' ||
         github.event_name == 'merge_group' ||
         github.event_name == 'workflow_dispatch' ||
-        (github.event.pull_request.head.repo.full_name == github.repository) ||
-        (github.event.label.name == 'maintainer:e2e:ok')
+        github.event.pull_request.head.repo.full_name == github.repository ||
+        github.event.label.name == 'maintainer:e2e:ok'
       )
     needs:
       - 'e2e_linux'

.github/workflows/orchestrator.yml

@@ -46,10 +46,14 @@ jobs:
       npm-registry-url: '${{ steps.get-vars.outputs.npm-registry-url }}'
     steps:
       - id: 'get-vars'
+        env:
+          CLI_PACKAGE_NAME: '${{ vars.CLI_PACKAGE_NAME }}'
+          NPM_REGISTRY_SCOPE: '${{ vars.NPM_REGISTRY_SCOPE }}'
+          NPM_REGISTRY_URL: '${{ vars.NPM_REGISTRY_URL }}'
         run: |
-          echo 'cli-package-name=${{ vars.CLI_PACKAGE_NAME }}' >> "$GITHUB_OUTPUT"
-          echo 'npm-registry-scope=${{ vars.NPM_REGISTRY_SCOPE }}' >> "$GITHUB_OUTPUT"
-          echo 'npm-registry-url=${{ vars.NPM_REGISTRY_URL }}' >> "$GITHUB_OUTPUT"
+          echo "cli-package-name=${CLI_PACKAGE_NAME}" >> "$GITHUB_OUTPUT"
+          echo "npm-registry-scope=${NPM_REGISTRY_SCOPE}" >> "$GITHUB_OUTPUT"
+          echo "npm-registry-url=${NPM_REGISTRY_URL}" >> "$GITHUB_OUTPUT"
 
   build-and-publish:
     name: 'Build and Publish CI Bundle'