From f9d510d7e0daa10790321775bf37e5c5e23657bb Mon Sep 17 00:00:00 2001 From: Daniel Gluskin <110768512+danielgluskin-starkware@users.noreply.github.com> Date: Sun, 23 Jun 2024 15:22:44 +0300 Subject: [PATCH] task(infra/cicd): develop branch publish tags on publish (#241) --- .changeset/cyan-ladybugs-glow.md | 5 ----- .changeset/dirty-rockets-flash.md | 5 ----- .changeset/famous-cougars-bathe.md | 6 ----- .changeset/loud-ladybugs-hide.md | 5 ----- .changeset/mighty-dancers-itch.md | 6 ----- .changeset/pre.json | 17 --------------- .changeset/rude-tigers-warn.md | 6 ----- .github/workflows/pr.yml | 22 ++++++++++++------- .github/workflows/release.yml | 35 ++++++++++++++++++------------ package.json | 4 ++-- packages/core/package.json | 2 +- packages/ui/package.json | 4 ++-- pnpm-lock.yaml | 2 +- 13 files changed, 41 insertions(+), 78 deletions(-) delete mode 100644 .changeset/cyan-ladybugs-glow.md delete mode 100644 .changeset/dirty-rockets-flash.md delete mode 100644 .changeset/famous-cougars-bathe.md delete mode 100644 .changeset/loud-ladybugs-hide.md delete mode 100644 .changeset/mighty-dancers-itch.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/rude-tigers-warn.md diff --git a/.changeset/cyan-ladybugs-glow.md b/.changeset/cyan-ladybugs-glow.md deleted file mode 100644 index 3d97bf2..0000000 --- a/.changeset/cyan-ladybugs-glow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"get-starknet-core": minor ---- - -Spec update diff --git a/.changeset/dirty-rockets-flash.md b/.changeset/dirty-rockets-flash.md deleted file mode 100644 index df63c3e..0000000 --- a/.changeset/dirty-rockets-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"get-starknet-core": minor ---- - -imported types diff --git a/.changeset/famous-cougars-bathe.md b/.changeset/famous-cougars-bathe.md deleted file mode 100644 index 53d2a40..0000000 --- a/.changeset/famous-cougars-bathe.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"get-starknet-core": major -"get-starknet": major ---- - -new wallet snip diff --git a/.changeset/loud-ladybugs-hide.md b/.changeset/loud-ladybugs-hide.md deleted file mode 100644 index 9f014ce..0000000 --- a/.changeset/loud-ladybugs-hide.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"get-starknet-core": patch ---- - -fix tests diff --git a/.changeset/mighty-dancers-itch.md b/.changeset/mighty-dancers-itch.md deleted file mode 100644 index 8ef3815..0000000 --- a/.changeset/mighty-dancers-itch.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"get-starknet-core": patch -"get-starknet": patch ---- - -prerelease diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index d446f03..0000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "mode": "pre", - "tag": "next", - "initialVersions": { - "get-starknet-example": "2.1.2", - "get-starknet-core": "3.2.0", - "get-starknet": "3.0.1" - }, - "changesets": [ - "cyan-ladybugs-glow", - "dirty-rockets-flash", - "famous-cougars-bathe", - "loud-ladybugs-hide", - "mighty-dancers-itch", - "rude-tigers-warn" - ] -} diff --git a/.changeset/rude-tigers-warn.md b/.changeset/rude-tigers-warn.md deleted file mode 100644 index a5c98ce..0000000 --- a/.changeset/rude-tigers-warn.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"get-starknet-core": patch -"get-starknet": patch ---- - -pre-release diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6dac0ba..ca027e4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,9 +1,10 @@ -name: PR +name: PR integration + on: pull_request: branches: - - develop - master + - develop jobs: version: @@ -11,20 +12,25 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout code repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: pnpm/action-setup@v2.2.2 + + - uses: pnpm/action-setup@v4 with: version: 8 + - name: setup node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: "pnpm" + - name: install dependencies run: pnpm install - - name: run tests - run: pnpm test + - name: check formatting run: pnpm format:check + + - name: run tests + run: pnpm test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c794ca1..c911b82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ name: Release + on: push: branches: @@ -11,45 +12,51 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout code repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: pnpm/action-setup@v2.2.2 + + - uses: pnpm/action-setup@v4 with: version: 8 + - name: setup node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 cache: "pnpm" + - name: Setup npmrc run: | echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_ACCESS_TOKEN }}" >> .npmrc + - name: install dependencies run: pnpm install + - name: run tests run: pnpm test + - name: copy readme to every package run: echo "./packages/core/ ./packages/ui/" | xargs -n 1 cp README.md - - name: Create Pre-release - if: github.ref == 'refs/heads/develop' + - name: Create Master Release + if: github.ref == 'refs/heads/master' uses: changesets/action@v1 with: version: pnpm run version - commit: "chore: pre-release version bump" - title: "Pre-release version bump" - publish: pnpm run publish:next + commit: "chore: version bump" + title: "Master branch version bump" + publish: pnpm run publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create Release - if: github.ref == 'refs/heads/master' + - name: Create Develop Release + if: github.ref == 'refs/heads/develop' uses: changesets/action@v1 with: version: pnpm run version - commit: "chore: release version bump" - title: "Release version bump" - publish: pnpm run publish + commit: "chore: version bump" + title: "Develop branch version bump" + publish: pnpm run publish:next env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 04da93b..ab91a0a 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "format": "prettier --ignore-path .gitignore --plugin-search-dir=. --write '**/*.{js,cjs,ts,tsx,svelte,md,yml,json}'", "format:check": "prettier --ignore-path .gitignore --plugin-search-dir=. --check '**/*.{js,cjs,ts,tsx,svelte,md,yml,json}'", "prepare": "pnpm run build && husky install", - "publish": "pnpm publish -r --no-git-checks", - "publish:next": "pnpm publish -r --no-git-checks --tag next", + "publish": "pnpm publish -r --no-git-checks && changeset tag", + "publish:next": "pnpm publish -r --no-git-checks --tag next && changeset tag", "test": "CI=true pnpm run -r test", "version": "changeset version && pnpm install --lockfile-only" }, diff --git a/packages/core/package.json b/packages/core/package.json index 2d343e8..751d60b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "get-starknet-core", - "version": "4.0.0-next.5", + "version": "4.0.0", "keywords": [ "starknet", "starkware", diff --git a/packages/ui/package.json b/packages/ui/package.json index 3c195e5..1f07379 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "get-starknet", - "version": "4.0.0-next.2", + "version": "4.0.0", "keywords": [ "starknet", "starkware", @@ -31,7 +31,7 @@ }, "dependencies": { "bowser": "^2.11.0", - "get-starknet-core": "workspace:^4.0.0-next.2" + "get-starknet-core": "workspace:^4.0.0" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11e9a7f..e4e0709 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,7 +95,7 @@ importers: specifier: ^2.11.0 version: 2.11.0 get-starknet-core: - specifier: workspace:^4.0.0-next.2 + specifier: workspace:^4.0.0 version: link:../core devDependencies: '@sveltejs/vite-plugin-svelte':