pr clean up

2026-06-23 09:47:45 -07:00 · 2025-10-24 09:02:32 -07:00
parent 6502f99619
commit 7c81b1837e
7 changed files with 138 additions and 147 deletions
@@ -94,16 +94,20 @@ runs:
      working-directory: '${{ inputs.working-directory }}'
      id: 'release_branch'
      shell: 'bash'
+      env:
+        RELEASE_TAG: '${{ inputs.release-tag }}'
      run: |
-        BRANCH_NAME="release/${{ inputs.release-tag }}"
+        BRANCH_NAME="release/${RELEASE_TAG}"
        git switch -c "${BRANCH_NAME}"
        echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"

    - name: '⬆️ Update package versions'
      working-directory: '${{ inputs.working-directory }}'
      shell: 'bash'
+      env:
+        RELEASE_VERSION: '${{ inputs.release-version }}'
      run: |
-        npm run release:version "${{ inputs.release-version }}"
+        npm run release:version "${RELEASE_VERSION}"

    - name: '💾 Commit and Conditionally Push package versions'
      working-directory: '${{ inputs.working-directory }}'
@@ -151,10 +155,11 @@ runs:
      working-directory: '${{ inputs.working-directory }}'
      env:
        NODE_AUTH_TOKEN: '${{ inputs.github-token }}'
+        DRY_RUN: '${{ inputs.dry-run }}'
      shell: 'bash'
      run: |
        npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
+          --dry-run="${DRY_RUN}" \
          --no-tag

    - name: 'Configure npm for publishing to npm'
@@ -181,22 +186,29 @@ runs:
      working-directory: '${{ inputs.working-directory }}'
      env:
        NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}'
+        DRY_RUN: '${{ inputs.dry-run }}'
+        CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
      shell: 'bash'
      run: |
        npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
-          --workspace="${{ inputs.core-package-name }}" \
+          --dry-run="${DRY_RUN}" \
+          --workspace="${CORE_PACKAGE_NAME}" \
          --no-tag
-        npm dist-tag rm ${{ inputs.core-package-name }} false --silent
+        npm dist-tag rm ${CORE_PACKAGE_NAME} false --silent

    - name: '🔗 Install latest core package'
-      if: "${{ inputs.dry-run != 'true' && inputs.use-bundle-release == 'false' }}"
+      if: "${{ inputs.dry-run == 'false' && inputs.use-bundle-release == 'false' }}"
      working-directory: '${{ inputs.working-directory }}'
      shell: 'bash'
+      env:
+        CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
+        RELEASE_VERSION: '${{ inputs.release-version }}'
+        CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+        A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
      run: |
-        npm install "${{ inputs.core-package-name }}@${{ inputs.release-version }}" \
-        --workspace="${{ inputs.cli-package-name }}" \
-        --workspace="${{ inputs.a2a-package-name }}" \
+        npm install "${CORE_PACKAGE_NAME}@${RELEASE_VERSION}" \
+        --workspace="${CLI_PACKAGE_NAME}" \
+        --workspace="${A2A_PACKAGE_NAME}" \
        --save-exact

    - name: 'Get CLI Token'
@@ -215,12 +227,14 @@ runs:
      working-directory: '${{ inputs.working-directory }}'
      env:
        NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}'
+        DRY_RUN: '${{ inputs.dry-run }}'
+        CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
      shell: 'bash'
      run: |
        npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
+          --dry-run="${DRY_RUN}" \
          --no-tag
-        npm dist-tag rm ${{ inputs.cli-package-name }} false --silent
+        npm dist-tag rm ${CLI_PACKAGE_NAME} false --silent

    - name: 'Get a2a-server Token'
      if: "${{ inputs.use-bundle-release == 'false' }}"
@@ -238,17 +252,19 @@ runs:
      working-directory: '${{ inputs.working-directory }}'
      env:
        NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}'
+        DRY_RUN: '${{ inputs.dry-run }}'
+        A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
      shell: 'bash'
      # Tag staging for initial release
      run: |
        npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
-          --workspace="${{ inputs.a2a-package-name }}" \
+          --dry-run="${DRY_RUN}" \
+          --workspace="${A2A_PACKAGE_NAME}" \
          --no-tag
-        npm dist-tag rm ${{ inputs.a2a-package-name }} false --silent
+        npm dist-tag rm ${A2A_PACKAGE_NAME} false --silent

    - name: '🔬 Verify NPM release by version'
-      if: "${{ inputs.dry-run != 'true' && inputs.force-skip-tests != 'true' && inputs.use-bundle-release == 'false' }}"
+      if: "${{ inputs.dry-run == 'false' && inputs.force-skip-tests == 'false' && inputs.use-bundle-release == 'false' }}"
      uses: './.github/actions/verify-release'
      with:
        npm-package: '${{ inputs.cli-package-name }}@${{ inputs.release-version }}'
@@ -275,31 +291,39 @@ runs:
        working-directory: '${{ inputs.working-directory }}'

    - name: '🔬 Verify Bundled NPM release by version'
-      if: "${{ inputs.dry-run != 'true' && inputs.force-skip-tests != 'true' && inputs.use-bundle-release == 'true' }}"
+      if: "${{ inputs.dry-run == 'false' && inputs.force-skip-tests == 'false' && inputs.use-bundle-release == 'true' }}"
      working-directory: '${{ inputs.working-directory }}'
      shell: 'bash'
+      env:
+        CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+        RELEASE_VERSION: '${{ inputs.release-version }}'
      run: |
-        npx -y ${{ inputs.cli-package-name }}@${{ inputs.release-version }} --version
+        npx -y ${CLI_PACKAGE_NAME}@${RELEASE_VERSION} --version

    - name: '🎉 Create GitHub Release'
      working-directory: '${{ inputs.working-directory }}'
-      if: "${{ inputs.dry-run != 'true' && inputs.skip-github-release != 'true' && inputs.npm-tag != 'dev' && inputs.npm-registry-url != 'https://npm.pkg.github.com/' }}"
+      if: "${{ inputs.dry-run == 'false' && inputs.skip-github-release == 'false' && inputs.npm-tag != 'dev' && inputs.npm-registry-url != 'https://npm.pkg.github.com/' }}"
      env:
        GITHUB_TOKEN: '${{ inputs.github-token }}'
+        RELEASE_TAG: '${{ inputs.release-tag }}'
+        BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
+        PREVIOUS_TAG: '${{ inputs.previous-tag }}'
      shell: 'bash'
      run: |
-        gh release create "${{ inputs.release-tag }}" \
+        gh release create "${RELEASE_TAG}" \
          bundle/gemini.js \
-          --target "${{ steps.release_branch.outputs.BRANCH_NAME }}" \
-          --title "Release ${{ inputs.release-tag }}" \
-          --notes-start-tag "${{ inputs.previous-tag }}" \
+          --target "${BRANCH_NAME}" \
+          --title "Release ${RELEASE_TAG}" \
+          --notes-start-tag "${PREVIOUS_TAG}" \
          --generate-notes

    - name: '🧹 Clean up release branch'
      working-directory: '${{ inputs.working-directory }}'
-      if: "${{ inputs.dry-run != 'true' && inputs.skip-branch-cleanup != 'true' }}"
+      if: "${{ inputs.dry-run == 'false' && inputs.skip-branch-cleanup == 'false' }}"
      continue-on-error: true
      shell: 'bash'
+      env:
+        BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
      run: |
-        echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..."
-        git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}"
+        echo "Cleaning up release branch ${BRANCH_NAME}..."
+        git push origin --delete "${BRANCH_NAME}"