diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6dac0ba..b99313e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,4 +1,5 @@ -name: PR +name: PR integration + on: pull_request: branches: @@ -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 43db6f8..c911b82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,10 @@ name: Release + on: push: branches: - master + - develop jobs: version: @@ -10,33 +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 + 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 and publish versions + + - name: Create Master Release + if: github.ref == 'refs/heads/master' uses: changesets/action@v1 with: version: pnpm run version - commit: "chore: update versions" - title: "chore: update versions" + commit: "chore: version bump" + title: "Master branch version bump" publish: pnpm run publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Create Develop Release + if: github.ref == 'refs/heads/develop' + uses: changesets/action@v1 + with: + version: pnpm run version + 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 42d301c..ab91a0a 100644 --- a/package.json +++ b/package.json @@ -8,7 +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": "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" },