Compare commits

...
12 changed files with 148 additions and 13 deletions
@@ -1,8 +1,8 @@
name: Version Bump
name: Version Bump Dev
on:
push:
branches: [ develop, main ]
branches: [ develop ]
jobs:
Build:
+77
View File
@@ -0,0 +1,77 @@
name: Version Bump Main
on:
push:
branches: [ main ]
jobs:
Build:
if: "${{ contains(github.event.head_commit.message, 'chore(release): publish main') == false }}"
runs-on: ubuntu-latest
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
token: ${{ secrets.CI_PAT_TOKEN }}
fetch-depth: 0
- uses: actions/setup-node@v3
with:
registry-url: 'https://registry.npmjs.org'
- name: Setup git config
run: |
git config --global user.name "standardci"
git config --global user.email "[email protected]"
- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Set up Ruby
uses: ruby/setup-ruby@v1
- name: Install Dependencies
run: yarn install
- name: Bump Prod Version Graduate
continue-on-error: true
id: graduateRelease
if: ${{ github.ref == 'refs/heads/main' }}
run: |
yarn release:prod:graduate
yarn publish:prod
- name: Bump Prod Version Fallback
if: ${{ always() && github.ref == 'refs/heads/main' && steps.graduateRelease.outcome == 'failure' }}
run: |
echo Falling back to non-graduate release due to https://github.com/lerna/lerna/issues/2532
git stash
yarn release:prod
yarn publish:prod
- name: Bump Beta Version
if: ${{ github.ref == 'refs/heads/develop' }}
run: |
yarn release:beta
yarn publish:beta
- name: Merge release into develop
if: ${{ github.ref == 'refs/heads/main' }}
run: |
git config pull.rebase false
git checkout develop
git pull origin main
git push origin develop
- name: Notify Release Update
if: ${{ github.ref == 'refs/heads/main' }}
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.CI_PAT_TOKEN }}
repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }}
event-type: releases-updated-event
+2 -2
View File
@@ -26,8 +26,8 @@
"start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server",
"prepare": "husky install",
"reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",
"release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"",
"release:prod:graduate": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish\"",
"release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish main\"",
"release:prod:graduate": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish main\"",
"release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"",
"publish:prod": "lerna publish from-git --yes",
"publish:beta": "lerna publish from-git --yes --dist-tag alpha",
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [3.22.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/desktop
## [3.22.14-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/desktop
## [3.22.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/desktop
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@standardnotes/desktop",
"main": "./app/dist/index.js",
"version": "3.22.13",
"version": "3.22.14",
"license": "AGPL-3.0-or-later",
"author": "Standard Notes.",
"private": true,
+26
View File
@@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/releases
## [1.1.3-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/releases
## [1.1.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/releases
## [1.1.2-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/releases
## [1.1.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/releases
## [1.1.1-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
### Bug Fixes
* add direct dependencies to releases package so its version is bumped when deps are ([c3b5620](https://github.com/standardnotes/app/commit/c3b5620bf60dbdab016ad694eaf4c27ce496b2e3))
# [1.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-20)
**Note:** Version bump only for package @standardnotes/releases
+5 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@standardnotes/releases",
"version": "1.1.0",
"version": "1.1.3",
"license": "AGPL-3.0-or-later",
"main": "dist/releases.json",
"publishConfig": {
@@ -16,6 +16,10 @@
"version": "yarn build"
},
"devDependencies": {
"@standardnotes/components-meta": "workspace:^",
"@standardnotes/desktop": "workspace:^",
"@standardnotes/mobile": "workspace:^",
"@standardnotes/web": "workspace:^",
"@types/node": "*",
"typescript": "*"
}
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.2.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web-server
## [1.2.16-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web-server
## [1.2.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web-server
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@standardnotes/web-server",
"version": "1.2.15",
"version": "1.2.16",
"license": "AGPL-3.0-or-later",
"private": true,
"author": "Standard Notes.",
+8
View File
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [3.24.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web
## [3.24.1-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web
# [3.24.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
**Note:** Version bump only for package @standardnotes/web
+2 -2
View File
@@ -1,9 +1,9 @@
{
"name": "@standardnotes/web",
"version": "3.24.0",
"version": "3.24.1",
"license": "AGPL-3.0-or-later",
"main": "dist/app.js",
"author": "Standard Notes.",
"author": "Standard Notes",
"private": true,
"files": [
"dist"
+8 -4
View File
@@ -5114,7 +5114,7 @@ __metadata:
languageName: node
linkType: hard
"@standardnotes/components-meta@workspace:*, @standardnotes/components-meta@workspace:packages/components":
"@standardnotes/components-meta@workspace:*, @standardnotes/components-meta@workspace:^, @standardnotes/components-meta@workspace:packages/components":
version: 0.0.0-use.local
resolution: "@standardnotes/components-meta@workspace:packages/components"
dependencies:
@@ -5146,7 +5146,7 @@ __metadata:
languageName: node
linkType: hard
"@standardnotes/desktop@workspace:packages/desktop":
"@standardnotes/desktop@workspace:^, @standardnotes/desktop@workspace:packages/desktop":
version: 0.0.0-use.local
resolution: "@standardnotes/desktop@workspace:packages/desktop"
dependencies:
@@ -5601,7 +5601,7 @@ __metadata:
languageName: unknown
linkType: soft
"@standardnotes/mobile@workspace:packages/mobile":
"@standardnotes/mobile@workspace:^, @standardnotes/mobile@workspace:packages/mobile":
version: 0.0.0-use.local
resolution: "@standardnotes/mobile@workspace:packages/mobile"
dependencies:
@@ -5737,6 +5737,10 @@ __metadata:
version: 0.0.0-use.local
resolution: "@standardnotes/releases@workspace:packages/releases"
dependencies:
"@standardnotes/components-meta": "workspace:^"
"@standardnotes/desktop": "workspace:^"
"@standardnotes/mobile": "workspace:^"
"@standardnotes/web": "workspace:^"
"@types/node": "*"
typescript: "*"
languageName: unknown
@@ -6069,7 +6073,7 @@ __metadata:
languageName: unknown
linkType: soft
"@standardnotes/web@workspace:*, @standardnotes/web@workspace:packages/web":
"@standardnotes/web@workspace:*, @standardnotes/web@workspace:^, @standardnotes/web@workspace:packages/web":
version: 0.0.0-use.local
resolution: "@standardnotes/web@workspace:packages/web"
dependencies: