From 21c748e3bea16736d836abdda4b3f0988aa1fe67 Mon Sep 17 00:00:00 2001
From: Kevin Day <kday@tamu.edu>
Date: Thu, 24 Aug 2023 11:18:44 -0500
Subject: [PATCH] Test that the github tests work with the selected version.

---
 .github/workflows/build.yml | 24 ++++++++++++------------
 package.json                |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a42bbe8..056c4f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,8 +3,8 @@ name: Build
 on: [ push, pull_request, workflow_dispatch ]
 
 env:
-  CI_WUI_BRANCH: ${{ vars.CI_WUI_BRANCH }}
-  CI_WUI_DISABLE_LOCAL_PUBLISH: ${{ vars.CI_WUI_DISABLE_LOCAL_PUBLISH }}
+  CI_WUI_BRANCH: ${{ vars.CI_WUI_BRANCH }}
+  CI_WUI_DISABLE_LOCAL_PUBLISH: ${{ vars.CI_WUI_DISABLE_LOCAL_PUBLISH }}
 
 jobs:
   build:
@@ -23,19 +23,19 @@ jobs:
           path: weaver-ui
           ref: 2.x
           # Specify depth of 0 to enable fetching all branches and tags so that the "Use Custom Weaver-UI-Core Repo Version" works.
-         fetch-depth: 0
-
+          fetch-depth: 0
+
       - name: "Detect Custom Weaver-UI-Core Repo Version"
         continue-on-error: true
         if: ${{ env.CI_WUI_BRANCH == '' }}
         run: |
-          cd weaver-ui
-          export CI_WUI_BRANCH_VERSION=$(grep -so -m 1 '"@wvr/core": "[^"]*"' ../repo/package.json | sed -e 's|"@wvr/core": "||' -e 's|"$||')
-          export CI_WUI_BRANCH=$(git tag | grep -so -m 1 "^$CI_WUI_BRANCH_VERSION$")
-          # Some projects prefix their version with a "v".
-          if [[ $CI_WUI_BRANCH == "" && $CI_WUI_BRANCH_VERSION != "" ]] ; then export CI_WUI_BRANCH=$(git tag | grep -so -m 1 "^v$CI_WUI_BRANCH_VERSION$") ; fi
-          echo "CI_WUI_BRANCH=$CI_WUI_BRANCH" >> $GITHUB_ENV
-
+            cd weaver-ui
+            export CI_WUI_BRANCH_VERSION=$(grep -so -m 1 '"@wvr/core": "[^"]*"' ../repo/package.json | sed -e 's|"@wvr/core": "||' -e 's|"$||')
+            export CI_WUI_BRANCH=$(git tag | grep -so -m 1 "^$CI_WUI_BRANCH_VERSION$")
+            # Some projects prefix their version with a "v".
+            if [[ $CI_WUI_BRANCH == "" && $CI_WUI_BRANCH_VERSION != "" ]] ; then export CI_WUI_BRANCH=$(git tag | grep -so -m 1 "^v$CI_WUI_BRANCH_VERSION$") ; fi
+            echo "CI_WUI_BRANCH=$CI_WUI_BRANCH" >> $GITHUB_ENV
+
       - name: "Use Custom Weaver-UI-Core Repo Version"
         continue-on-error: true
         if: ${{ env.CI_WUI_BRANCH != '' }}
@@ -47,9 +47,9 @@ jobs:
         run: docker-compose -f $GITHUB_WORKSPACE/weaver-ui/docker-compose.yml up -d registry
 
       - name: "Publish Weaver-UI-Core (@wvr/core)"
+        if: ${{ env.CI_WUI_DISABLE_LOCAL_PUBLISH != 'true' }}
         run: |
           cd $GITHUB_WORKSPACE/weaver-ui
-          if: ${{ env.CI_WUI_DISABLE_LOCAL_PUBLISH != 'true' }}
           npm run publish:local
 
       - name: "Install Chrome Drivers"
diff --git a/package.json b/package.json
index ed4a32a..7f3ad7c 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "start": "wvr server --port 8080"
   },
   "dependencies": {
-    "@wvr/core": "2.2.2-rc.14",
+    "@wvr/core": "2.2.5",
     "ng-table": "3.0.1"
   },
   "devDependencies": {