diff --git a/.github/workflows/minor-release-latest.yml b/.github/workflows/minor-release-latest.yml index f7a6a275..39bd9518 100644 --- a/.github/workflows/minor-release-latest.yml +++ b/.github/workflows/minor-release-latest.yml @@ -30,6 +30,7 @@ jobs: run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' + echo "GITHUB_TOKEN=${{ secrets.IQ_ADM_TIM_TOKEN }}" >> $GITHUB_ENV - name: Setup npm auth run: | echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc @@ -47,20 +48,13 @@ jobs: VERSION=$(node -p 'require("./lerna.json").version') echo "CURRENT_VERSION=$VERSION" >> $GITHUB_ENV echo "PREVIOUS_TAG=$(git describe --tags --abbrev=0 --exclude $VERSION 2>/dev/null || echo '')" >> $GITHUB_ENV - - name: PR Comment - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const curr = `v${process.env.CURRENT_VERSION}`; - const body = `Minor release publicado: ${curr}`; - if (!context.issue.number) { - core.warning('Sem issue/PR number detectado para comentar.'); - } else { - await github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body - }); - } + env: + GITHUB_TOKEN: ${{ secrets.IQ_ADM_TIM_TOKEN }} + - name: Merge latest into main + run: | + git checkout main + git pull origin main + git merge latest + git push origin main + env: + GITHUB_TOKEN: ${{ secrets.IQ_ADM_TIM_TOKEN }} diff --git a/.github/workflows/patch-release-main.yml b/.github/workflows/patch-release-main.yml index a0649bd8..0c23de6a 100644 --- a/.github/workflows/patch-release-main.yml +++ b/.github/workflows/patch-release-main.yml @@ -40,24 +40,8 @@ jobs: run: yarn install --frozen-lockfile - name: Build libs run: yarn build:libs - - name: Publish to NPM - run: lerna publish from-package --yes --no-verify-access + - name: Publish NPM + run: yarn publish:patch env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: PR Comment - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const curr = `v${process.env.CURRENT_VERSION}`; - const body = `Patch release publicado: ${curr}`; - if (!context.issue.number) { - core.warning('Sem issue/PR number detectado para comentar.'); - } else { - await github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body - }); - } + GITHUB_TOKEN: ${{ secrets.IQ_ADM_TIM_TOKEN }} diff --git a/lerna.json b/lerna.json index 7df4ada2..69641ee3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,6 @@ { - "packages": [ - "packages/*" - ], - "version": "0.9.9", + "packages": ["packages/*"], + "version": "0.10.2", "npmClient": "yarn", "command": { "publish": { @@ -19,4 +17,4 @@ "message": "chore(release): publish %s" } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 66138a9a..d5f5d98c 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "version:patch": "lerna version patch --exact --yes", "version:minor": "lerna version minor --exact --yes", "publish:from-package": "lerna publish from-package --yes --no-verify-access", - "publish:canary": "yarn version:prerelease && yarn publish:from-package --dist-tag next", + "publish:canary": "yarn version:prerelease github && yarn publish:from-package --dist-tag next", "publish:patch": "yarn version:patch && yarn publish:from-package", - "publish:minor": "yarn version:minor && yarn publish:from-package", + "publish:minor": "yarn version:minor --create-release github && yarn publish:from-package", "prepare": "husky" }, "devDependencies": { diff --git a/packages/aurora-theme/package.json b/packages/aurora-theme/package.json index 6ace166e..f6265b64 100644 --- a/packages/aurora-theme/package.json +++ b/packages/aurora-theme/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/aurora-theme", - "version": "0.9.9", + "version": "0.10.2", "description": "> AURORA Theme", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/blueberry/package.json b/packages/blueberry/package.json index e0cbe417..e37ad001 100644 --- a/packages/blueberry/package.json +++ b/packages/blueberry/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/blueberry-theme", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/br-addons/package.json b/packages/br-addons/package.json index 8de0d08b..aff36ae5 100644 --- a/packages/br-addons/package.json +++ b/packages/br-addons/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/br-addons", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/client-core/package.json b/packages/client-core/package.json index 4f6b61d2..63952366 100644 --- a/packages/client-core/package.json +++ b/packages/client-core/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/client-core", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/client/package.json b/packages/client/package.json index 76d5aaae..406b3eca 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/client", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/entities/package.json b/packages/entities/package.json index 5196c912..2d1b3bac 100644 --- a/packages/entities/package.json +++ b/packages/entities/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/entities", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "private": true, diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json index 2188927f..12d7cf4b 100644 --- a/packages/json-schema/package.json +++ b/packages/json-schema/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/json-schema", - "version": "0.9.9", + "version": "0.10.2", "description": "json schema lib", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/lab/package.json b/packages/lab/package.json index 6baea472..744a4bef 100644 --- a/packages/lab/package.json +++ b/packages/lab/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/lab", - "version": "0.9.9", + "version": "0.10.2", "private": true, "license": "Apache-2.0", "dependencies": { diff --git a/packages/material-theme/package.json b/packages/material-theme/package.json index cc28343d..369936b6 100644 --- a/packages/material-theme/package.json +++ b/packages/material-theme/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/material-theme", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme", diff --git a/packages/validators/package.json b/packages/validators/package.json index d7fcceb2..9644034e 100644 --- a/packages/validators/package.json +++ b/packages/validators/package.json @@ -1,6 +1,6 @@ { "name": "@iq-firebolt/validators", - "version": "0.9.9", + "version": "0.10.2", "description": "> TODO: description", "author": "iq team", "homepage": "https://github.com/IQ-tech/firebolt#readme",