diff --git a/.azure-devops/graphitation-release.yml b/.azure-devops/graphitation-release.yml index d84f9aaff..f59807219 100644 --- a/.azure-devops/graphitation-release.yml +++ b/.azure-devops/graphitation-release.yml @@ -1,7 +1,6 @@ pr: none trigger: - main - - alloy/relay-apollo-duct-tape variables: - group: InfoSec-SecurityResults @@ -48,6 +47,9 @@ extends: - checkout: self persistCredentials: true # fix for beachball: https://github.com/microsoft/beachball/issues/674 fetchDepth: 2 + - script: | + releaseBranch="origin/${BUILD_SOURCEBRANCH#refs/heads/}" + echo "Release branch: $releaseBranch" - script: yarn displayName: yarn - script: | @@ -58,7 +60,14 @@ extends: git config user.name "Graphitation Service Account" git fetch --depth=2 displayName: Configure git for release - - script: yarn release -y -n $(ossNpmToken) --access public --no-push --keep-change-files + - script: | + releaseBranch="origin/${BUILD_SOURCEBRANCH#refs/heads/}" + + if [ "${BUILD_SOURCEBRANCH}" = "refs/heads/main" ]; then + yarn beachball publish -b "$releaseBranch" -y -n $(ossNpmToken) --access public --no-push --keep-change-files + else + yarn beachball publish -b "$releaseBranch" -t alpha --prerelease-prefix alpha -y -n $(ossNpmToken) --access public --no-push --keep-change-files + fi displayName: Release to the npm registry - script: | git restore . @@ -69,7 +78,14 @@ extends: - task: npmAuthenticate@0 inputs: workingFile: ".npmrc" - - script: yarn release -y --registry $(adoNpmFeedBaseUrl) + - script: | + releaseBranch="origin/${BUILD_SOURCEBRANCH#refs/heads/}" + + if [ "${BUILD_SOURCEBRANCH}" = "refs/heads/main" ]; then + yarn beachball publish -b "$releaseBranch" -y --registry $(adoNpmFeedBaseUrl) + else + yarn beachball publish -b "$releaseBranch" -t alpha --prerelease-prefix alpha -y --registry $(adoNpmFeedBaseUrl) + fi displayName: Release to the ado npm feed - task: 1ES.PublishPipelineArtifact@1 displayName: 📒 Publish Manifest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41833ae5c..a0a6d7677 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,9 +52,8 @@ yarn test yarn lint ``` -## Releasing alpha versions +## Releasing versions including prerelease versions -1. Add a branch which will be releasing alpha version to .azure-devops\graphitation-release.yml into `trigger` -2. Change `release` script in the root package json to `yarn beachball publish -t alpha`, -3. Modify package.json of the package you want to release to x.x.x-alpha.0 -4. Every time you want to release a new version use `yarn change` and select `prelease`. To avoid patching of dependent packages set `dependentChangeType` to `none` manually in .changes directory +1. Open the `graphitation-release` pipeline in Azure DevOps and run it from the branch you want to release from. +1. If the branch is `main`, packages are published with the default npm dist-tag (`latest`). +1. If the branch is not `main`, packages are published with the `alpha` npm dist-tag automatically and the version is suffixed with `-alpha.x` (where x is the number of prerelease versions published for that package). diff --git a/package.json b/package.json index 08170a49b..7eba0d22b 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "lint": "lage lint --continue", "lage": "lage", "ci": "yarn lage build types test lint && yarn checkchange", - "beachball": "beachball -b origin/main", - "change": "yarn beachball change", - "checkchange": "yarn beachball check", + "beachball": "beachball", + "change": "yarn beachball -b origin/main change", + "checkchange": "yarn beachball -b origin/main check", "release": "yarn beachball publish -t latest", "postinstall": "patch-package" }, @@ -49,4 +49,4 @@ "serialize-javascript": "^7.0.4", "webpack": "^5.105.4" } -} +} \ No newline at end of file diff --git a/packages/rempl-apollo-devtools/CHANGELOG.json b/packages/rempl-apollo-devtools/CHANGELOG.json index 7a973bac7..713e7cf99 100644 --- a/packages/rempl-apollo-devtools/CHANGELOG.json +++ b/packages/rempl-apollo-devtools/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@graphitation/rempl-apollo-devtools", "entries": [ + { + "date": "Fri, 13 Mar 2026 10:34:02 GMT", + "version": "2.1.7-alpha.0", + "tag": "@graphitation/rempl-apollo-devtools_v2.1.7-alpha.0", + "comments": { + "patch": [ + { + "author": "pavelglac@gmail.com", + "package": "@graphitation/rempl-apollo-devtools", + "commit": "7d532053bd3a1a628c8ebf6490a12e9c60875148", + "comment": "test release" + } + ] + } + }, { "date": "Thu, 12 Mar 2026 13:08:20 GMT", "version": "2.1.6", diff --git a/packages/rempl-apollo-devtools/CHANGELOG.md b/packages/rempl-apollo-devtools/CHANGELOG.md index c9b0855c0..dee0763c7 100644 --- a/packages/rempl-apollo-devtools/CHANGELOG.md +++ b/packages/rempl-apollo-devtools/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - @graphitation/rempl-apollo-devtools - + +## 2.1.7-alpha.0 + +Fri, 13 Mar 2026 10:34:02 GMT + +### Patches + +- test release (pavelglac@gmail.com) + ## 2.1.6 Fri, 06 Mar 2026 20:27:06 GMT diff --git a/packages/rempl-apollo-devtools/README.md b/packages/rempl-apollo-devtools/README.md index 372749b31..83b07d7aa 100644 --- a/packages/rempl-apollo-devtools/README.md +++ b/packages/rempl-apollo-devtools/README.md @@ -97,3 +97,5 @@ trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies. + + diff --git a/packages/rempl-apollo-devtools/package.json b/packages/rempl-apollo-devtools/package.json index 52250b556..b9e259a0a 100644 --- a/packages/rempl-apollo-devtools/package.json +++ b/packages/rempl-apollo-devtools/package.json @@ -1,7 +1,7 @@ { "name": "@graphitation/rempl-apollo-devtools", "license": "MIT", - "version": "2.1.6", + "version": "2.1.7-alpha.0", "main": "./dist/apollo-devtools.js", "repository": { "type": "git",