From 5dd882c9692de02afec2005049a4ef782356396d Mon Sep 17 00:00:00 2001 From: Sasha <118575614+weboko@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:39:06 +0100 Subject: [PATCH 1/2] chore: make pre-release manual (#1702) * make pre-release manual * update md file --- .github/workflows/ci.yml | 23 ----------------------- .github/workflows/pre-release.yml | 25 +++++++++++++++++++++++++ CONTRIBUTING.md | 9 +++++++++ 3 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/pre-release.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46988480ca..f57da9be15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,29 +96,6 @@ jobs: test_type: nwaku-master debug: waku* - pre-release: - name: pre-release - runs-on: ubuntu-latest - if: github.event_name == 'push' && github.ref == 'refs/heads/master' - needs: [check, proto, browser, node] - steps: - - uses: actions/checkout@v3 - with: - repository: waku-org/js-waku - - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_JS }} - registry-url: "https://registry.npmjs.org" - - - run: npm install - - - run: npm run build - - - run: npm run publish -- --tag next - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_JS_WAKU_PUBLISH }} - maybe-release: name: release runs-on: ubuntu-latest diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml new file mode 100644 index 0000000000..77cf70f0e5 --- /dev/null +++ b/.github/workflows/pre-release.yml @@ -0,0 +1,25 @@ +on: + workflow_dispatch: + +jobs: + pre-release: + name: pre-release + runs-on: ubuntu-latest + if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' + steps: + - uses: actions/checkout@v3 + with: + repository: waku-org/js-waku + + - uses: actions/setup-node@v3 + with: + node-version: ${{ env.NODE_JS }} + registry-url: "https://registry.npmjs.org" + + - run: npm install + + - run: npm run build + + - run: npm run publish -- --tag next + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_JS_WAKU_PUBLISH }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05d7f04b4c..e7c708a434 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,3 +60,12 @@ Commit messages should never contain any `@` mentions (usernames prefixed with " Please refer to the [Git manual](https://git-scm.com/doc) for more information about Git. + +### Releasing + +`js-waku` has two types of releases: +- public releases; +- pre releases; + +Public releases happen by merging PRs opened by `release-please` action. +Pre releases happen manually by triggering [this workflow](https://github.com/waku-org/js-waku/actions/workflows/pre-release.yml) From 535a748ae98c6eae83877a60105f4fdf2625d4d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 01:17:38 +0530 Subject: [PATCH 2/2] chore(deps)(deps-dev): bump @types/uuid from 9.0.4 to 9.0.6 (#1706) Bumps [@types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/uuid) from 9.0.4 to 9.0.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/uuid) --- updated-dependencies: - dependency-name: "@types/uuid" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 15 +++++++++------ packages/core/package.json | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92a0b0ce9a..4dd09997c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4098,9 +4098,10 @@ "license": "MIT" }, "node_modules/@types/uuid": { - "version": "9.0.4", - "dev": true, - "license": "MIT" + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", + "dev": true }, "node_modules/@types/ws": { "version": "8.5.5", @@ -25942,7 +25943,7 @@ "@types/chai": "^4.3.5", "@types/debug": "^4.1.10", "@types/mocha": "^10.0.1", - "@types/uuid": "^9.0.3", + "@types/uuid": "^9.0.6", "@waku/build-utils": "*", "chai": "^4.3.7", "cspell": "^7.3.2", @@ -28939,7 +28940,9 @@ "version": "3.0.0" }, "@types/uuid": { - "version": "9.0.4", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", "dev": true }, "@types/ws": { @@ -29249,7 +29252,7 @@ "@types/chai": "^4.3.5", "@types/debug": "^4.1.10", "@types/mocha": "^10.0.1", - "@types/uuid": "^9.0.3", + "@types/uuid": "^9.0.6", "@waku/build-utils": "*", "@waku/enr": "^0.0.19", "@waku/interfaces": "0.0.20", diff --git a/packages/core/package.json b/packages/core/package.json index 2ff3b6a4cd..d124acbef2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -93,7 +93,7 @@ "@types/chai": "^4.3.5", "@types/debug": "^4.1.10", "@types/mocha": "^10.0.1", - "@types/uuid": "^9.0.3", + "@types/uuid": "^9.0.6", "@waku/build-utils": "*", "chai": "^4.3.7", "cspell": "^7.3.2",