From 373cd91a82678c468e900d7f4c1531a4bae59c64 Mon Sep 17 00:00:00 2001
From: Drew DeCarme <drewdecarme@gmail.com>
Date: Wed, 1 Nov 2023 09:19:41 -0400
Subject: [PATCH] ci: Attempt new version

---
 .changeset/config.json        |  2 +-
 .github/workflows/release.yml | 26 ++++++++++++++++----------
 package.json                  |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.changeset/config.json b/.changeset/config.json
index f26daf1..118ffd7 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
   "changelog": "@changesets/cli/changelog",
-  "commit": false,
+  "commit": true,
   "fixed": [],
   "linked": [],
   "access": "public",
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0323286..a538ad2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,31 +18,37 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          persist-credentials: false
 
       - name: Setup Node.js LTS
         uses: actions/setup-node@v3
         with:
           node-version: "lts/*"
 
-      - name: Install dependencies
-        run: yarn install --immutable
-
-      - name: Set yarn config
+      - name: Setup Yarn v4
         run: |
-          yarn config set npmScopes.flare-city.npmAuthToken "\${NPM_TOKEN}"
+          yarn config set npmScopes.npmAuthToken "\${NPM_TOKEN}"
         env:
           NPM_TOKEN: ${{ secrets.FLARE_CITY_NPM }}
 
-      - name: Create Release Pull Request or Publish to npm
+      - name: Install dependencies
+        run: yarn  --immutable
+
+      - name: Packages - build
+        run: yarn build
+
+      - name: Packages - version
         id: changesets
         uses: changesets/action@v1
         with:
           title: "chore: Version packages"
           commit: "chore: Version packages"
-          publish: yarn release
+          version: yarn version # version so pnp can reconcile packages
+          publish: yarn pusblish # build and publish to npm
         env:
           GITHUB_TOKEN: ${{ secrets.FLARE_CITY_GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.FLARE_CITY_NPM }}
+
+      - name: Packages - tag
+        # if: steps.changesets.outputs.hasChangesets == 'false'
+        # You can do something when a publish should happen.
+        run: yarn tag
diff --git a/package.json b/package.json
index f011964..676096a 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
   },
   "scripts": {
     "build": "yarn turbo build --filter='!with-*'",
+    "version": "yarn changeset version",
     "publish": "yarn workspaces foreach --all --no-private npm publish --access public",
-    "tag": "yarn changeset tag",
-    "release": "yarn build && yarn publish && yarn tag"
+    "tag": "yarn changeset tag"
   },
   "author": "Drew DeCarme",
   "license": "MIT",