Skip to content

Commit d7de74c

Browse files
chore: sync main → develop #5
Co-authored-by: Julio Araujo <julio.araujo@rocket.chat>
1 parent cd18f32 commit d7de74c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/changeset.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22

33
on:
44
push:
5-
branches: [develop]
5+
branches: [develop, main]
66

77
concurrency: ${{ github.workflow }}-${{ github.ref }}
88

@@ -27,18 +27,19 @@ jobs:
2727

2828
- run: npm ci
2929

30-
- name: Create Version Packages PR
30+
- name: Create Version Packages PR or Publish
3131
id: changesets
3232
uses: changesets/action@v1
3333
with:
3434
version: npm run version
35+
publish: npm run release
3536
title: "chore: release"
3637
commit: "chore: version packages"
3738
env:
3839
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3940

4041
- name: Retarget PR to main and update title with version
41-
if: steps.changesets.outputs.pullRequestNumber != ''
42+
if: steps.changesets.outputs.pullRequestNumber != '' && github.ref == 'refs/heads/develop'
4243
run: |
4344
git fetch origin changeset-release/develop
4445
VERSION=$(git show origin/changeset-release/develop:package.json | jq -r '.version')

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"validate-config": "node scripts/validate-config.js",
1414
"changeset": "changeset",
1515
"version": "changeset version",
16+
"release": "changeset tag",
1617
"lint": "eslint . --max-warnings=0",
1718
"test": "vitest run",
1819
"test:watch": "vitest",

0 commit comments

Comments
 (0)