diff --git a/.github/workflows/release-patch-3-release.yml b/.github/workflows/release-patch-3-release.yml index d7d4cd2137..f079ec9359 100644 --- a/.github/workflows/release-patch-3-release.yml +++ b/.github/workflows/release-patch-3-release.yml @@ -34,7 +34,7 @@ on: type: 'choice' options: - 'prod' - ## - 'dev' # TODO(richieforeman) - support dev + - 'dev' default: 'prod' jobs: @@ -66,7 +66,17 @@ jobs: node-version-file: '.nvmrc' cache: 'npm' + - name: 'configure .npmrc' + uses: './.github/actions/setup-npmrc' + with: + github-token: '${{ secrets.GITHUB_TOKEN }}' + + - name: 'Install Script Dependencies' + run: |- + npm ci + - name: 'Install Dependencies' + working-directory: './release' run: |- npm ci @@ -81,10 +91,11 @@ jobs: env: GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}' PATCH_FROM: '${{ github.event.inputs.type }}' + CLI_PACKAGE_NAME: '${{vars.CLI_PACKAGE_NAME}}' run: | # Use the existing get-release-version.js script to calculate patch version # Run from main checkout which has full git history and access to npm - PATCH_JSON=$(node scripts/get-release-version.js --type=patch --patch-from="${PATCH_FROM}") + PATCH_JSON=$(node scripts/get-release-version.js --type=patch --cli-package-name="${CLI_PACKAGE_NAME}" --patch-from="${PATCH_FROM}") echo "Patch version calculation result: ${PATCH_JSON}" RELEASE_VERSION=$(echo "${PATCH_JSON}" | jq -r .releaseVersion) @@ -115,7 +126,7 @@ jobs: # Re-run the same version calculation script echo "Re-calculating version to check for changes..." - CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --type=patch --patch-from="${CHANNEL}") + CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --cli-package-name="${{vars.CLI_PACKAGE_NAME}}" --type=patch --patch-from="${CHANNEL}") CURRENT_RELEASE_VERSION=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseVersion) CURRENT_RELEASE_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseTag) CURRENT_PREVIOUS_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .previousReleaseTag) @@ -172,7 +183,6 @@ jobs: github-token: '${{ secrets.GITHUB_TOKEN }}' dry-run: '${{ github.event.inputs.dry_run }}' previous-tag: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}' - working-directory: './release' gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' npm-registry-publish-url: '${{ vars.NPM_REGISTRY_PUBLISH_URL }}' npm-registry-url: '${{ vars.NPM_REGISTRY_URL }}' @@ -180,6 +190,7 @@ jobs: cli-package-name: '${{ vars.CLI_PACKAGE_NAME }}' core-package-name: '${{ vars.CORE_PACKAGE_NAME }}' a2a-package-name: '${{ vars.A2A_PACKAGE_NAME }}' + working-directory: './release' - name: 'Create Issue on Failure' if: '${{ failure() && github.event.inputs.dry_run == false }}'