fix: yarn registry

Signed-off-by: Ourchitecture.io <[email protected]>
ourchitecture · Nov 3, 2023 · 74b5a5b · 74b5a5b
1 parent 9249533
commit 74b5a5b
Show file tree

Hide file tree

Showing 3 changed files with 2,874 additions and 2,863 deletions.
diff --git a/.github/workflows/repo-tests.yaml b/.github/workflows/repo-tests.yaml
@@ -28,6 +28,12 @@ jobs:
               shell: bash
               run: echo "NPM_VERSION=$(cat ./.npmrc)" >> $GITHUB_OUTPUT
 
+            - name: Get yarn version
+              id: yarn-version
+              shell: bash
+              working-directory: ./src/backstage/ourstage/
+              run: cat ./package.json | jq -r .packageManager | sed 's\yarn@\\g' | xargs -I {} -n 1 echo 'YARN_VERSION={}' >> $GITHUB_OUTPUT
+
             - name: Get pnpm version
               id: pnpm-version
               shell: bash
@@ -46,9 +52,12 @@ jobs:
                   cache: 'pnpm'
                   cache-dependency-path: '**/pnpm-lock.yaml'
 
-            - name: Install npm
-              id: npm-install
-              run: npm install --location=global npm@${{ steps.npm-version.outputs.NPM_VERSION }}
+            - name: Install npm and yarn
+              id: npm-and-yarn-install
+              run: |
+                  npm install --location=global \
+                    npm@${{ steps.npm-version.outputs.NPM_VERSION }} \
+                    yarn@${{ steps.yarn-version.outputs.YARN_VERSION }}
 
             - name: Setup Wireit cache
               id: cache-wireit

diff --git a/src/backstage/ourstage/makefile b/src/backstage/ourstage/makefile
@@ -53,8 +53,10 @@ upgrade: init
 clean:
 	@yarn clean
 	@rm --recursive --force \
+		./coverage/ \
 		./dist-types/ \
-		./backend/dist/
+		./packages/app/dist/ \
+		./packages/backend/dist/
 
 .PHONY: reset
 reset: clean