Skip to content

Commit 87ad024

Browse files
authored
Merge pull request #23 from jescalada/release/1.2
fix: cascade `release/1.2` bugfixes into `release/1.3`
2 parents cef54f7 + 1eed7b3 commit 87ad024

6 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/release-drafter-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name-template: 'v$RESOLVED_VERSION'
33
tag-template: 'v$RESOLVED_VERSION'
44
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
5+
filter-by-commitish: true
56
template: |
67
### What's Changed
78

.github/workflows/npm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
# Otherwise, this is a maintenance release on an older line
7373
# Tag as v<major>.<minor> so users can pin to it
7474
MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
75-
DIST_TAG="v${MAJOR_MINOR}"
75+
DIST_TAG="release-${MAJOR_MINOR}"
7676
echo "Maintenance release detected, publishing under '$DIST_TAG' tag"
7777
npm publish "${PUBLISH_FLAGS[@]}" --tag "$DIST_TAG"
7878
fi

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
Testing GitLabFlow branching strategy. This should automatically create a draft setting the project to `v1.1.0`.
44

5+
Simulating bugfix in v1.1.0. This should trigger a v1.1.1 publish from the `release-drafter.yml`. Making a new PR.
6+
57
Testing new feature on `v1.1.0`, from `main`. This should automatically create a draft setting the project to `v1.2.0`. Note that `v1.1.0` release has already been made, and a `v1.1.1` bugfix draft is present.
68

9+
Simulating bugfix in `v1.2.1`. This should create a `1.2.2` draft release.
10+
711
Testing new feature on `v1.2.0` from `main`. This should create a draft to `1.3.0` once the `release/1.3` branch is created. Retesting.

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jescalada/git-proxy-deployment-testing",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "Testing deployment workflows for @finos/git-proxy.",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

packages/git-proxy-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jescalada/git-proxy-cli",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "Command line interface tool for FINOS GitProxy.",
55
"bin": {
66
"git-proxy-cli": "./dist/index.js"

0 commit comments

Comments
 (0)