diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 7644962e5..a7e0ca56b 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -5,15 +5,29 @@ on: branches: [ develop, main ] jobs: - test: + Build: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 with: + token: ${{ secrets.CI_PAT_TOKEN }} fetch-depth: 0 + + - name: Setup git config + run: | + git config --global user.name "standardci" + git config --global user.email "ci@standardnotes.com" + - 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: ESLint @@ -22,5 +36,10 @@ jobs: run: yarn build - name: Test run: yarn test - - name: Bump Version - run: yarn release + + - name: Bump Prod Version + if: ${{ github.ref == 'refs/heads/main' }} + run: yarn release:prod + - name: Bump Beta Version + if: ${{ github.ref == 'refs/heads/develop' }} + run: yarn release:beta diff --git a/package.json b/package.json index 008a94001..ca4545b53 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "node": ">=12.19.0 <17.0.0" }, "scripts": { - "lint": "yarn workspaces foreach --parallel run lint", - "test": "yarn workspaces foreach --parallel run test", + "lint": "yarn workspaces foreach --parallel --verbose run lint", + "test": "yarn workspaces foreach --parallel --verbose run test", "clean": "lerna run clean", - "build": "yarn workspaces foreach -pt run build", + "build": "yarn workspaces foreach -pt --verbose run build", "build:icons": "yarn workspace @standardnotes/icons build", "build:styles": "yarn workspace @standardnotes/styles build", "build:web": "yarn workspace @standardnotes/web build", @@ -22,7 +22,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", - "release": "lerna version --conventional-commits --yes -m \"chore(release): publish\"" + "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"", + "release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"" }, "resolutions": { "@types/styled-components/@types/react": "17.0.2", diff --git a/packages/components/package.json b/packages/components/package.json index 843dff9f5..5885534ff 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -8,8 +8,8 @@ ] }, "scripts": { - "build": "echo BUILDING COMPONENTS && yarn workspaces foreach --parallel run build", - "lint": "yarn workspaces foreach --parallel run lint" + "build": "yarn workspaces foreach --parallel --verbose run build", + "lint": "yarn workspaces foreach --parallel --verbose run lint" }, "devDependencies": { "@standardnotes/deterministic-zip": "^1.2.0", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 468d835b3..49c36f767 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -15,7 +15,7 @@ }, "scripts": { "build:remove-unpacked": "rimraf dist/{linux-*,mac,win-*}", - "build": "echo BUILDING DESKTOP && yarn run webpack --config desktop.webpack.prod.js", + "build": "yarn run webpack --config desktop.webpack.prod.js", "build:desktop:all": "yarn workspaces foreach -ptR run build", "clean:build": "rimraf app/dist/", "clean:tests": "rimraf test/data/tmp/", diff --git a/packages/icons/package.json b/packages/icons/package.json index 717c1f4c6..b3aaf62f9 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -7,7 +7,7 @@ "scripts": { "start": "webpack-dev-server --config webpack.config.js", "watch": "webpack -w --config webpack.config.js", - "build": "echo BUILDING ICONS && webpack --config webpack.config.js && yarn run tsc", + "build": "webpack --config webpack.config.js && yarn run tsc", "tsc": "tsc --project ./tsconfig.json" }, "devDependencies": { diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 60ff8f3be..46e44dbd5 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/mobile", "version": "3.23.0", - "user-version": "3.22.0", + "user-version": "3.23.0", "private": true, "license": "AGPL-3.0-or-later", "scripts": { diff --git a/packages/styles/package.json b/packages/styles/package.json index 1f17229d9..5ef50da96 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -8,7 +8,7 @@ "access": "public" }, "scripts": { - "build": "echo BUILDING STYLES && webpack --mode='production' && yarn run tsc", + "build": "webpack --mode='production' && yarn run tsc", "start": "webpack --watch --mode='development'", "lint": "prettier --check *.js" }, diff --git a/packages/web/package.json b/packages/web/package.json index b81fe756b..65eb70c22 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -13,7 +13,7 @@ "watch": "webpack -w --config web.webpack.dev.js", "clean": "rm -fr dist", "prebuild": "yarn clean", - "build": "echo BUILDING WEB && webpack --config web.webpack.prod.js && yarn tsc", + "build": "webpack --config web.webpack.prod.js && yarn tsc", "build:web:all": "yarn workspaces foreach -ptR run build", "lint": "eslint src/javascripts", "tsc": "tsc --project tsconfig.json",