chore: update version and publish workflow #10231
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,19 +33,20 @@ permissions: | |
| jobs: | ||
| ci: | ||
| uses: ./.github/workflows/build.yml | ||
| publish: | ||
| needs: ci | ||
| runs-on: ubuntu-latest | ||
| # Don't try to publish from a fork of RaspberryPiFoundation/blockly-samples. | ||
| if: ${{ github.repository_owner == 'RaspberryPiFoundation' }} | ||
| environment: release | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v7 | ||
| with: | ||
| ref: ${{ github.ref }} | ||
| fetch-depth: 0 | ||
| ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }} | ||
|
|
||
| - name: Setup Node.js | ||
| uses: actions/setup-node@v7 | ||
|
|
@@ -54,146 +55,86 @@ jobs: | |
| registry-url: 'https://registry.npmjs.org' | ||
|
|
||
| - name: Install dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Determine Dist Tag | ||
| id: dist | ||
| env: | ||
| VERSION_OVERRIDE: ${{ inputs.version_override }} | ||
| DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} | ||
| REF_NAME: ${{ github.ref_name }} | ||
| run: | | ||
| DIST_TAG=$([[ "${VERSION_OVERRIDE}" == *"-beta."* || "${REF_NAME}" != "${DEFAULT_BRANCH}" ]] && echo "beta" || echo "latest") | ||
| echo "dist_tag=$DIST_TAG" >> "$GITHUB_OUTPUT" | ||
| echo "NPM distribution tag: $DIST_TAG" | ||
|
|
||
| - name: Version | ||
| if: ${{ !inputs.skip_versioning }} | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| VERSION_OVERRIDE: ${{ inputs.version_override }} | ||
| DRY_RUN: ${{ inputs.dry_run }} | ||
| DIST_TAG: ${{ steps.dist.outputs.dist_tag }} | ||
| run: | | ||
| set -euo pipefail | ||
|
Contributor
There was a problem hiding this comment. I think you want to keep this to make sure we can see error output and that an error in lerna causes the step to fail (my bash is kinda rusty tho) |
||
| VERSION_COMMAND="npx lerna version" | ||
|
Contributor
Author
There was a problem hiding this comment. I'm essentially doing a string builder and adding the appropriate flags depending on the inputs and which branch we're working from. |
||
| if [ -n "${VERSION_OVERRIDE}" ]; then | ||
| VERSION_COMMAND="${VERSION_COMMAND} ${VERSION_OVERRIDE}" | ||
| fi | ||
| if [ "${DIST_TAG}" = "latest" ]; then | ||
| VERSION=$(node -p "require('./packages/blockly/package.json').version") | ||
| if [[ "${VERSION}" == *"-beta."* ]]; then | ||
| VERSION_COMMAND="${VERSION_COMMAND} --conventional-graduate" | ||
| fi | ||
| else | ||
| VERSION_COMMAND="${VERSION_COMMAND} --conventional-prerelease --preid beta" | ||
| fi | ||
| VERSION_COMMAND="${VERSION_COMMAND} --conventional-commits --yes" | ||
| if [ "${DRY_RUN}" = "true" ]; then | ||
|
Contributor
Author
There was a problem hiding this comment. This is a change from what I showed you the other day. I moved dry run into here so that we're using the same version command that would be applied with the same inputs. |
||
| VERSION_COMMAND="${VERSION_COMMAND} --no-push --no-git-tag-version" | ||
| echo "Dry run: would publish the following versions to npm dist-tag: ${DIST_TAG}" | ||
| eval "$VERSION_COMMAND" | ||
| if [ "${DIST_TAG}" = "beta" ]; then | ||
| echo "GitHub release would be created as prerelease." | ||
| fi | ||
| else | ||
| eval "$VERSION_COMMAND" | ||
| fi | ||
|
|
||
| - name: Build core package | ||
| working-directory: packages/blockly | ||
| run: npm run package | ||
|
|
||
| - name: Publish | ||
|
Contributor
There was a problem hiding this comment. this step also shouldn't run if dry run is true. |
||
| if: ${{ !inputs.dry_run }} | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| SKIP_VERSIONING: ${{ inputs.skip_versioning }} | ||
| DIST_TAG: ${{ steps.dist.outputs.dist_tag }} | ||
| run: | | ||
| if [ "${SKIP_VERSIONING}" = "true" ]; then | ||
| npx lerna publish from-package --yes --dist-tag ${DIST_TAG} --loglevel silly | ||
| else | ||
| npx lerna publish from-git --yes --dist-tag ${DIST_TAG} --loglevel silly | ||
| fi | ||
|
|
||
| - name: Create GitHub release | ||
|
Contributor
There was a problem hiding this comment. this step shouldn't run if dry-run is true |
||
| if: ${{ !inputs.dry_run }} | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| DIST_TAG: ${{ steps.dist.outputs.dist_tag }} | ||
| run: | | ||
| VERSION=$(node -p "require('./packages/blockly/package.json').version") | ||
| TARBALL="blockly-*${VERSION}.tgz" | ||
|
Contributor
Author
There was a problem hiding this comment. I'm not 100% sure on this. I did a test of packing locally and all of the file names matched this pattern, so I think this will work.
Contributor
There was a problem hiding this comment. this tarball isn't going to exist right now because you removed the "create tarball" step
Contributor
Author
There was a problem hiding this comment. The publish step should create the tarball. I found that info here: https://github.com/lerna/lerna/tree/main/libs/commands/publish#lifecycle-scripts
Contributor
There was a problem hiding this comment. i'm pretty sure this will be in a temp directory though and not exist at the package root where you're looking for it here. |
||
| if [ "${DIST_TAG}" == "beta" ]; then | ||
| gh release create "blockly-v${VERSION}" "$TARBALL" \ | ||
| --repo "$GITHUB_REPOSITORY" \ | ||
| --title "blockly-v${VERSION}" \ | ||
| --generate-notes \ | ||
| --prerelease | ||
| else | ||
| gh release create "blockly-v${VERSION}" "$TARBALL" \ | ||
| --repo "$GITHUB_REPOSITORY" \ | ||
| --title "blockly-v${VERSION}" \ | ||
| --generate-notes | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "version": "13.2.0", | ||
| "npmClient": "npm", | ||
| "changelogPreset": { | ||
| "name": "conventionalcommits" | ||
| }, | ||
| "ignoreChanges": ["**/package-lock.json"], | ||
| "command": { | ||
| "version": { | ||
| "tagVersionPrefix": "blockly-v" | ||
| }, | ||
| "publish": { | ||
| "tagVersionPrefix": "blockly-v" | ||
| } | ||
| }, | ||
| "packages": ["packages/blockly", "packages/plugins/*"], | ||
| "$schema": "node_modules/lerna/schemas/lerna-schema.json" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should add the guard that we have in samples that doesn't bother to run any part of this if the owner isn't RaspberryPiFoundation