diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7697cca..d215737 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,12 +57,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: npx release-it --ci - - name: Create PR to sync main to develop + - name: Sync main to develop if: github.ref == 'refs/heads/main' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --base develop --head main \ - --title "chore: sync release from main [skip ci]" \ - --body "Sync release commits from main to develop. [skip ci]" \ - && gh pr merge --merge || true + git fetch origin develop + git checkout develop + git merge main --strategy-option theirs -m "chore: sync release from main [skip ci]" + git push origin develop diff --git a/CHANGELOG.md b/CHANGELOG.md index 79888ac..920d476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.5.1-beta.2](https://github.com/wireweave/language-data/compare/v1.5.1-beta.1...v1.5.1-beta.2) (2026-03-09) + +## [1.5.1-beta.1](https://github.com/wireweave/language-data/compare/v1.5.1-beta.0...v1.5.1-beta.1) (2026-03-08) + +## [1.5.1-beta.0](https://github.com/wireweave/language-data/compare/v1.5.0...v1.5.1-beta.0) (2026-03-07) + ## [1.5.0](https://github.com/wireweave/language-data/compare/v1.5.0-beta.1...v1.5.0) (2026-03-07) ## [1.5.0-beta.1](https://github.com/wireweave/language-data/compare/v1.5.0-beta.0...v1.5.0-beta.1) (2026-03-07) diff --git a/package.json b/package.json index 31fac2b..5a43fe7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@wireweave/language-data", - "version": "1.5.0", + "version": "1.5.1-beta.2", "description": "Shared language definitions for Wireweave DSL editors", "type": "module", "main": "dist/index.js",