From 5b723d015c20e65a6a029ee59dab8a2170cd4b68 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 10:58:36 +0100 Subject: [PATCH 01/13] split beta and prod workflow to release two types of package --- .../{on-release.yml => on-release-beta.yml} | 6 +- .github/workflows/on-release-prod.yml | 87 +++++++++++++++++++ 2 files changed, 88 insertions(+), 5 deletions(-) rename .github/workflows/{on-release.yml => on-release-beta.yml} (90%) create mode 100644 .github/workflows/on-release-prod.yml diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release-beta.yml similarity index 90% rename from .github/workflows/on-release.yml rename to .github/workflows/on-release-beta.yml index c0505eb3a8..98d801ced1 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release-beta.yml @@ -39,12 +39,8 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY + npx lerna version --conventional-commits --conventional-prerelease --preid beta --create-release github --force-publish=* --yes - if [ ${{ github.base_ref }} = main ]; then - npx lerna version --conventional-commits --create-release github --force-publish=* --yes - else - npx lerna version --conventional-commits --conventional-prerelease --preid beta --create-release github --force-publish=* --yes - fi npx lerna publish from-git --no-verify-access --yes ######################### # Generate documentation diff --git a/.github/workflows/on-release-prod.yml b/.github/workflows/on-release-prod.yml new file mode 100644 index 0000000000..125e924d32 --- /dev/null +++ b/.github/workflows/on-release-prod.yml @@ -0,0 +1,87 @@ +name: release +on: + workflow_dispatch: {} +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: "Checkout" + uses: actions/checkout@v2 + with: + token: ${{ secrets.GH_PUBLISH_TOKEN }} + fetch-depth: 0 + ######################### + # Release new version + ######################### + - name: "Use NodeJS 14" + uses: actions/setup-node@v2 + with: + node-version: '14' + - name: "Setup npm" + run: | + npm set "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" + - name: Install packages + run: | + npm ci + npm run lerna-ci + - name: Run lint + run: npm run lerna-lint + - name: Run tests + run: npm run lerna-test + - name: "Version and publish" + env: + GH_TOKEN: ${{ secrets.GH_PUBLISH_TOKEN }} + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY + npx lerna version --conventional-commits --create-release github --force-publish=* --yes + npx lerna publish from-git --no-verify-access --yes + ######################### + # Generate documentation + ######################### + - name: Set up Python + uses: actions/setup-python@v2.3.1 + with: + python-version: '3.8' + - name: Set RELEASE_VERSION env var + run: | + RELEASE_VERSION=$(cat packages/commons/package.json | jq '.version' -r) + echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV + - name: Install doc generation dependencies + run: | + pip install --upgrade pip + pip install -r docs/requirements.txt + - name: Setup doc deploy + run: | + git config --global user.name Docs deploy + git config --global user.email docs@dummy.bot.com + - name: Build mkdocs site in "gh-pages" branch and push + run: | + rm -rf site + VERSION="${{ env.RELEASE_VERSION }}" + ALIAS="latest" + echo "Publishing doc for version: $VERSION" + mkdocs build + mike deploy --push --update-aliases "$VERSION" "$ALIAS" + # Set latest version as a default + mike set-default --push latest + - name: Build API docs + run: | + rm -rf api + npm run docs-generateApiDoc + - name: Release API docs to the released version + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./api + keep_files: true + destination_dir: ${{ env.RELEASE_VERSION }}/api + - name: Release API docs to the "latest" version + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./api + keep_files: true + destination_dir: latest/api From 8bd063a983836e4f5bc4590a98cff11e05c43471 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 11:18:44 +0100 Subject: [PATCH 02/13] chore(cicd): reet changelog --- CHANGELOG.md | 187 --------------------------------------------------- 1 file changed, 187 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d6d94adee..e69de29bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,187 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.2.0-beta.12](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.11...v0.2.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.11](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.10...v0.2.0-beta.11) (2021-12-28) - - -### Bug Fixes - -* Remove publishing doc on `develop` version and fix missing leading 0 in version ([#356](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/356)) ([44991bc](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/44991bcdf0842274333928da3cc12052624808eb)) - - - - - -# [0.2.0-beta.10](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.9...v0.2.0-beta.10) (2021-12-28) - - -### Features - -* generate new version of doc for each release ([#355](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/355)) ([9f45ee1](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/9f45ee12ceced39acc2cc69934a10f18cb95a161)) - - - - - -# [0.2.0-beta.9](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.8...v0.2.0-beta.9) (2021-12-28) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.8](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.7...v0.2.0-beta.8) (2021-12-28) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.7](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.6...v0.2.0-beta.7) (2021-12-27) - - -### Features - -* **metrics:** logMetrics middleware ([#338](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/338)) ([f8cf705](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/f8cf7055de78e4515ffbae5de5867649a38dc17d)) - - - - - -# [0.2.0-beta.6](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.5...v0.2.0-beta.6) (2021-12-23) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.5](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.4...v0.2.0-beta.5) (2021-12-21) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.4](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.3...v0.2.0-beta.4) (2021-12-21) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.3](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.2...v0.2.0-beta.3) (2021-12-17) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.2](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.1...v0.2.0-beta.2) (2021-12-17) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.1](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.2.0-beta.0...v0.2.0-beta.1) (2021-12-17) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# [0.2.0-beta.0](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.1.1-beta.0...v0.2.0-beta.0) (2021-12-17) - - -### Features - -* **tracer:** middy middleware ([#324](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/324)) ([2909d6f](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/2909d6f9b9bf1a570f950e17f0d49acbe63653ee)) - - - - - -# [0.1.0-beta.9](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.1.0-beta.8...v0.1.0-beta.9) (2021-12-15) - - -### Bug Fixes - -* **metrics:** lib entrypoint ([819098b](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/819098b9e820d0998b6116b659dd456ae65ba20a)) - - - - - -# [0.1.0-beta.8](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.1.0-beta.7...v0.1.0-beta.8) (2021-12-15) - -**Note:** Version bump only for package aws-lambda-powertools-typescript - - - - - -# 0.1.0-beta.7 (2021-12-15) - - -### Bug Fixes - -* **cicd:** Fix/release ([#323](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/323)) ([9df4493](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/9df449370c1441d3c9d7165bc3b161a15dd2e1de)) -* **ci:** merge conflict ([97796df](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/97796df7cb7036396459279224d64bd277651e71)) -* **ci:** updated github actions commands ([76ba8c7](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/76ba8c76c33db5eba44a50c015880520f04bb54c)) -* **ci:** updated NPM dependencies (audit) ([3166c7b](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/3166c7b7c58baa8414121c73f15139f4db0ccf38)) -* hosted-git-info bump in logger ([fb2a365](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/fb2a365cc73ae60d6e32d46361265a5ee8f5cad1)) -* **logger:** jest set to next version as workaround for vulnerability ([0f423bf](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/0f423bf7479a28829e81fabc6c58ed4e76dcfda4)) -* **logging:** removed forgotten dummy folder ([a10791f](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/a10791f5201739ab2f5f7019bbc52ea04cb0d723)) -* **metrics:** publish metrics even if handler throw ([#249](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/249)) ([8ad0a6a](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/8ad0a6ac388641a41da08fefee48f6b996544a0a)) -* upgrade of dependencies, npm-shrinkwrap for packages/logger ([c120c64](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/c120c64670ac3ed86438267c0a9c9fc72a3f7ebe)) -* version bumb for commitlint/cli ([0e1f6be](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/0e1f6be2786779ca43c3fcac6cb9e96431ca585d)) - - -### Features - -* add metrics ([#102](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/102)) ([cf22210](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/cf22210ebb519cf0a625a2bdc92d2bcea7b4a59d)) -* Adding sample automation for PR ([#121](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/121)) ([7bf63bb](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/7bf63bb8554972f30b450c1cbf100aea2b580162)) -* **logger:** add context decorator functionality ([#13](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/13)) ([369e4d1](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/369e4d1595776f4c563b1e9eb803897677df041f)) -* **logger:** adding basic crude logger module, and support for log levels by passed param/env param ([a3ff0ba](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/a3ff0bab8f89a51dc3953cdbdcd5cd74aac6db0a)) -* **logger:** basic logger logic ([#9](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/9)) ([5f867ea](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/5f867ea8dc43bd315a27d051993625fa699d514a)), closes [#10](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/10) -* **logger:** lint error fixes ([5272ac0](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/5272ac0c12bbfe23395429f8a239f90ac8676b15)) -* **logging:** added basic lerna package for the logging module ([14c679d](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/14c679da949cd4b4ef5cd076ce1a7da5132c3cde)) - - - - - -# Changelog - -All notable changes to this project will be documented in this file. - -This project follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format for changes and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - - -## [Unreleased] - -## 0.1.0 - -### Features - -* **tracer:** beta release ([#91](https://github.com/awslabs/aws-lambda-powertools-python/issues/91)) -* **logger:** beta release ([#24](https://github.com/awslabs/aws-lambda-powertools-python/issues/24)) -* **metrics:** beta release ([#25](https://github.com/awslabs/aws-lambda-powertools-python/issues/25)) From 84063d7007a4e449f83585901331fbff08404fc8 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:10:36 +0100 Subject: [PATCH 03/13] follow #366 discussions current proposal --- .github/workflows/on-release-beta.yml | 10 +++++++--- .github/workflows/on-release-prod.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-release-beta.yml index 98d801ced1..087883ee3f 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-release-beta.yml @@ -2,7 +2,7 @@ name: release on: push: branches: - - main + - feat/cicd/prodWorkflow workflow_dispatch: {} jobs: publish: @@ -39,9 +39,13 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - npx lerna version --conventional-commits --conventional-prerelease --preid beta --create-release github --force-publish=* --yes - npx lerna publish from-git --no-verify-access --yes + # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation + npx lerna version --conventional-commits --conventional-prerelease --force-publish=* --yes --no-changelog + git tag -d $(git describe --abbrev=0) + git push + + npx lerna publish from-package --no-verify-access --yes ######################### # Generate documentation ######################### diff --git a/.github/workflows/on-release-prod.yml b/.github/workflows/on-release-prod.yml index 125e924d32..d9436d4dfb 100644 --- a/.github/workflows/on-release-prod.yml +++ b/.github/workflows/on-release-prod.yml @@ -36,7 +36,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - npx lerna version --conventional-commits --create-release github --force-publish=* --yes + npx lerna version --conventional-commits --conventional-graduate --create-release github --force-publish=* --yes npx lerna publish from-git --no-verify-access --yes ######################### # Generate documentation From 524032b5da24c4c7e44d630bd0268f29638c158d Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:10:36 +0100 Subject: [PATCH 04/13] follow #366 discussions current proposal --- .github/workflows/on-release-beta.yml | 8 ++++++-- .github/workflows/on-release-prod.yml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-release-beta.yml index 98d801ced1..af51780c51 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-release-beta.yml @@ -39,9 +39,13 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - npx lerna version --conventional-commits --conventional-prerelease --preid beta --create-release github --force-publish=* --yes - npx lerna publish from-git --no-verify-access --yes + # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation + npx lerna version --conventional-commits --conventional-prerelease --force-publish=* --yes --no-changelog + git tag -d $(git describe --abbrev=0) + git push + + npx lerna publish from-package --no-verify-access --yes ######################### # Generate documentation ######################### diff --git a/.github/workflows/on-release-prod.yml b/.github/workflows/on-release-prod.yml index 125e924d32..d9436d4dfb 100644 --- a/.github/workflows/on-release-prod.yml +++ b/.github/workflows/on-release-prod.yml @@ -36,7 +36,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - npx lerna version --conventional-commits --create-release github --force-publish=* --yes + npx lerna version --conventional-commits --conventional-graduate --create-release github --force-publish=* --yes npx lerna publish from-git --no-verify-access --yes ######################### # Generate documentation From 8a694d0dbaba2dc8e6e26685afdb5a7e326c222b Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:19:58 +0100 Subject: [PATCH 05/13] test pre-release --- .github/workflows/on-release-beta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-release-beta.yml index 087883ee3f..cc5d215c41 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-release-beta.yml @@ -41,7 +41,7 @@ jobs: git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation - npx lerna version --conventional-commits --conventional-prerelease --force-publish=* --yes --no-changelog + npx lerna version --conventional-commits --conventional-prerelease --preid test --force-publish=* --yes --no-changelog git tag -d $(git describe --abbrev=0) git push From 9b3fb5208214e15bea8000ab1c440b05b0b4bd33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 Dec 2021 14:23:45 +0000 Subject: [PATCH 06/13] chore(release): v0.2.0-test.0 [skip ci] --- lerna.json | 2 +- packages/commons/package-lock.json | 2 +- packages/commons/package.json | 2 +- packages/logger/package.json | 2 +- packages/metrics/package-lock.json | 2 +- packages/metrics/package.json | 2 +- packages/tracing/package-lock.json | 2 +- packages/tracing/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index fb05b84495..0d5b65fec1 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "npmClient": "npm", "message": "chore(release): %s [skip ci]" } diff --git a/packages/commons/package-lock.json b/packages/commons/package-lock.json index 59566d8c88..991ee1cb1d 100644 --- a/packages/commons/package-lock.json +++ b/packages/commons/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/commons", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/commons/package.json b/packages/commons/package.json index eead8ed4e9..bbc7afaf20 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/commons", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "description": "A shared utility package for AWS Lambda powertools (TypeScript) libraries", "author": { "name": "Amazon Web Services", diff --git a/packages/logger/package.json b/packages/logger/package.json index 712c2101ba..5673e57d26 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/logger", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "description": "The logging package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", diff --git a/packages/metrics/package-lock.json b/packages/metrics/package-lock.json index 9aede6eeb2..a063dd2be8 100644 --- a/packages/metrics/package-lock.json +++ b/packages/metrics/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/metrics", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 1a123ccd95..43ca648a22 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/metrics", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "description": "The metrics package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", diff --git a/packages/tracing/package-lock.json b/packages/tracing/package-lock.json index 252f4bb11c..c71bc77e6c 100644 --- a/packages/tracing/package-lock.json +++ b/packages/tracing/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/tracer", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 7f55a85ee3..2e98dc79c9 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/tracer", - "version": "0.2.0-beta.12", + "version": "0.2.0-test.0", "description": "The tracer package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", From 33328fce89d94518321d673c5a9da170b3f7069f Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:28:05 +0100 Subject: [PATCH 07/13] move back to main --- .github/workflows/on-release-beta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-release-beta.yml index cc5d215c41..9e0c9564fd 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-release-beta.yml @@ -2,7 +2,7 @@ name: release on: push: branches: - - feat/cicd/prodWorkflow + - main workflow_dispatch: {} jobs: publish: @@ -41,7 +41,7 @@ jobs: git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation - npx lerna version --conventional-commits --conventional-prerelease --preid test --force-publish=* --yes --no-changelog + npx lerna version --conventional-commits --conventional-prerelease --preid rc --force-publish=* --yes --no-changelog git tag -d $(git describe --abbrev=0) git push From 3be1be82c90c7694912b31efba15296b1fabc6ee Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:28:57 +0100 Subject: [PATCH 08/13] Revert "chore(release): v0.2.0-test.0 [skip ci]" This reverts commit 9b3fb5208214e15bea8000ab1c440b05b0b4bd33. --- lerna.json | 2 +- packages/commons/package-lock.json | 2 +- packages/commons/package.json | 2 +- packages/logger/package.json | 2 +- packages/metrics/package-lock.json | 2 +- packages/metrics/package.json | 2 +- packages/tracing/package-lock.json | 2 +- packages/tracing/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index 0d5b65fec1..fb05b84495 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "npmClient": "npm", "message": "chore(release): %s [skip ci]" } diff --git a/packages/commons/package-lock.json b/packages/commons/package-lock.json index 991ee1cb1d..59566d8c88 100644 --- a/packages/commons/package-lock.json +++ b/packages/commons/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/commons", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/commons/package.json b/packages/commons/package.json index bbc7afaf20..eead8ed4e9 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/commons", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "description": "A shared utility package for AWS Lambda powertools (TypeScript) libraries", "author": { "name": "Amazon Web Services", diff --git a/packages/logger/package.json b/packages/logger/package.json index 5673e57d26..712c2101ba 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/logger", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "description": "The logging package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", diff --git a/packages/metrics/package-lock.json b/packages/metrics/package-lock.json index a063dd2be8..9aede6eeb2 100644 --- a/packages/metrics/package-lock.json +++ b/packages/metrics/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/metrics", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 43ca648a22..1a123ccd95 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/metrics", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "description": "The metrics package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", diff --git a/packages/tracing/package-lock.json b/packages/tracing/package-lock.json index c71bc77e6c..252f4bb11c 100644 --- a/packages/tracing/package-lock.json +++ b/packages/tracing/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/tracer", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 2e98dc79c9..7f55a85ee3 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -1,6 +1,6 @@ { "name": "@aws-lambda-powertools/tracer", - "version": "0.2.0-test.0", + "version": "0.2.0-beta.12", "description": "The tracer package for the AWS Lambda powertools (TypeScript) library", "author": { "name": "Amazon Web Services", From a69f6cec81ad313b959af045082b9d8b03efe51d Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 29 Dec 2021 15:50:51 +0100 Subject: [PATCH 09/13] fix tag deletion --- .github/workflows/on-release-beta.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-release-beta.yml index 9e0c9564fd..6d784c40e0 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-release-beta.yml @@ -41,9 +41,8 @@ jobs: git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation - npx lerna version --conventional-commits --conventional-prerelease --preid rc --force-publish=* --yes --no-changelog - git tag -d $(git describe --abbrev=0) - git push + npx lerna version --conventional-commits --conventional-prerelease --preid beta --force-publish=* --yes --no-changelog + git push --delete origin $(git describe --abbrev=0) npx lerna publish from-package --no-verify-access --yes ######################### From 40120426d2a17529a42bc8fec22a066a631ce182 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Tue, 4 Jan 2022 08:59:46 +0100 Subject: [PATCH 10/13] Apply lastest decisions around release proces --- .../{on-release-beta.yml => on-merge-to-main.yml} | 14 ++++---------- .github/workflows/on-release-prod.yml | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) rename .github/workflows/{on-release-beta.yml => on-merge-to-main.yml} (85%) diff --git a/.github/workflows/on-release-beta.yml b/.github/workflows/on-merge-to-main.yml similarity index 85% rename from .github/workflows/on-release-beta.yml rename to .github/workflows/on-merge-to-main.yml index 6d784c40e0..f035c13517 100644 --- a/.github/workflows/on-release-beta.yml +++ b/.github/workflows/on-merge-to-main.yml @@ -41,10 +41,8 @@ jobs: git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation - npx lerna version --conventional-commits --conventional-prerelease --preid beta --force-publish=* --yes --no-changelog + npx lerna version --conventional-commits --conventional-prerelease --preid dev --force-publish=* --yes --no-changelog git push --delete origin $(git describe --abbrev=0) - - npx lerna publish from-package --no-verify-access --yes ######################### # Generate documentation ######################### @@ -52,10 +50,6 @@ jobs: uses: actions/setup-python@v2.3.1 with: python-version: '3.8' - - name: Set RELEASE_VERSION env var - run: | - RELEASE_VERSION=$(cat packages/commons/package.json | jq '.version' -r) - echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV - name: Install doc generation dependencies run: | pip install --upgrade pip @@ -67,8 +61,8 @@ jobs: - name: Build mkdocs site in "gh-pages" branch and push run: | rm -rf site - VERSION="${{ env.RELEASE_VERSION }}" - ALIAS="latest" + VERSION="dev" + ALIAS="dev" echo "Publishing doc for version: $VERSION" mkdocs build mike deploy --push --update-aliases "$VERSION" "$ALIAS" @@ -84,7 +78,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./api keep_files: true - destination_dir: ${{ env.RELEASE_VERSION }}/api + destination_dir: dev/api - name: Release API docs to the "latest" version uses: peaceiris/actions-gh-pages@v3 with: diff --git a/.github/workflows/on-release-prod.yml b/.github/workflows/on-release-prod.yml index b3a8c8dd92..6428cce1d4 100644 --- a/.github/workflows/on-release-prod.yml +++ b/.github/workflows/on-release-prod.yml @@ -36,7 +36,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - npx lerna version --conventional-commits --conventional-graduate --create-release github --force-publish=* --yes + npx lerna version --conventional-commits --conventional-graduate --force-publish=* --yes npx lerna publish from-git --no-verify-access --yes ######################### # Generate documentation From b32f825f9e281eb7fe3fe7c79fb85248db7c4176 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Tue, 4 Jan 2022 09:18:18 +0100 Subject: [PATCH 11/13] remove doc alias for unreleased merge PR --- .github/workflows/on-merge-to-main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/on-merge-to-main.yml b/.github/workflows/on-merge-to-main.yml index f035c13517..91e5c37054 100644 --- a/.github/workflows/on-merge-to-main.yml +++ b/.github/workflows/on-merge-to-main.yml @@ -62,10 +62,9 @@ jobs: run: | rm -rf site VERSION="dev" - ALIAS="dev" echo "Publishing doc for version: $VERSION" mkdocs build - mike deploy --push --update-aliases "$VERSION" "$ALIAS" + mike deploy --push "$VERSION" # Set latest version as a default mike set-default --push latest - name: Build API docs From d8fd2c1f74501ce5558057171742bd0eafdc55de Mon Sep 17 00:00:00 2001 From: Florian Chazal Date: Tue, 4 Jan 2022 10:49:23 +0100 Subject: [PATCH 12/13] rename on merge to main workflow --- .github/workflows/on-merge-to-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-merge-to-main.yml b/.github/workflows/on-merge-to-main.yml index 91e5c37054..ee3e40ae97 100644 --- a/.github/workflows/on-merge-to-main.yml +++ b/.github/workflows/on-merge-to-main.yml @@ -1,4 +1,4 @@ -name: release +name: on-merge-to-main on: push: branches: From 9f8bf478e108108bc357eeb602eb689e1a2d30cc Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Tue, 4 Jan 2022 14:01:16 +0100 Subject: [PATCH 13/13] move release drafter to on-merge-to-main --- .github/workflows/on-merge-to-main.yml | 12 +++++++++--- .github/workflows/release-drafter.yml | 14 -------------- 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/workflows/on-merge-to-main.yml b/.github/workflows/on-merge-to-main.yml index 91e5c37054..b65bb5db6f 100644 --- a/.github/workflows/on-merge-to-main.yml +++ b/.github/workflows/on-merge-to-main.yml @@ -40,9 +40,17 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - # Follow https://github.com/lerna/lerna/issues/2248#issuecomment-527882069 recommendation + # For merge to main we + ## don't create github release, + ## don't update changelog (--no-changelog) + ## bump version as a pre-release (--conventional-prerelease) + ## add a custom preid (--preid dev): 0.2.0-dev.1 -> 0.2.0-dev.2 npx lerna version --conventional-commits --conventional-prerelease --preid dev --force-publish=* --yes --no-changelog git push --delete origin $(git describe --abbrev=0) + - name: update_release_draft: + uses: release-drafter/release-drafter@v5.15.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ######################### # Generate documentation ######################### @@ -65,8 +73,6 @@ jobs: echo "Publishing doc for version: $VERSION" mkdocs build mike deploy --push "$VERSION" - # Set latest version as a default - mike set-default --push latest - name: Build API docs run: | rm -rf api diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 67f7eb268e..0000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - main - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5.15.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}