Include appbuilder version in project cache key

Author: FyreByrd

.github/workflows/main.yml

@@ -7,32 +7,12 @@ on:
         branches: ['*']
 
 jobs:
-    check-appbuilders-version:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Get AppBuilder Version
-              run: |
-                  # Get tag from GHCR
-                  TOKEN_JSON=$(curl https://ghcr.io/token\?scope\="repository:sillsdev/app-builders:pull")
-                  TOKEN=$(echo "$TOKEN_JSON" | jq -r ".token")
-                  TAG_DATA=$(curl -H "Authorization: Bearer $TOKEN" https://ghcr.io/v2/sillsdev/app-builders/tags/list)
-                  NUM_TAGS=$(echo "$TAG_DATA" | jq -r '.tags | length')
-                  FROM_GHCR=$(echo "$TAG_DATA" | jq -r ".tags[$(("$NUM_TAGS" - 1))]")
-                  echo "Latest tag of sillsdev/app-builders is: $FROM_GHCR"
-                  # Get version from package.json
-                  FROM_PACKAGE=$(jq -r ".version" "package.json")
-                  echo "Latest version of sillsdev/appbuilder-pwa is: $FROM_PACKAGE"
-                  if [ "$FROM_GHCR" != "$FROM_PACKAGE" ]; then
-                      echo "version in package.json does not match latest version from ghcr"
-                      exit 1
-                  fi
-
     setup:
         runs-on: ubuntu-latest
 
+        outputs:
+          appbuilder_version: ${{ steps.get_version.outputs.appbuilder_version }}
+
         steps:
             - uses: actions/checkout@v4
 
@@ -63,12 +43,24 @@ jobs:
                   path: node_modules
                   key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
 
+            - name: Get AppBuilder Version
+              id: get_version
+              run: |
+                  # Get tag from GHCR
+                  TOKEN_JSON=$(curl https://ghcr.io/token\?scope\="repository:sillsdev/app-builders:pull")
+                  TOKEN=$(echo "$TOKEN_JSON" | jq -r ".token")
+                  TAG_DATA=$(curl -H "Authorization: Bearer $TOKEN" https://ghcr.io/v2/sillsdev/app-builders/tags/list)
+                  NUM_TAGS=$(echo "$TAG_DATA" | jq -r '.tags | length')
+                  FROM_GHCR=$(echo "$TAG_DATA" | jq -r ".tags[$(("$NUM_TAGS" - 1))]")
+                  echo "Latest tag of sillsdev/app-builders is: $FROM_GHCR"
+                  echo "appbuilder_version=$FROM_GHCR" >> $GITHUB_OUTPUT
+
             - name: Restore Projects cache
               id: restore-projects-cache
               uses: actions/cache@v4
               with:
                   path: project_data
-                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}
+                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}-${{ steps.get_version.outputs.appbuilder_version }}
 
             - name: Setup Java
               if: steps.restore-projects-cache.outputs.cache-hit != 'true'
@@ -163,7 +155,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: project_data
-                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}
+                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}-${{ needs.setup.outputs.appbuilder_version }}
 
             - name: Convert minimal project
               run: |
@@ -203,7 +195,7 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: project_data
-                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}
+                  key: ${{ runner.os }}-projects-${{ hashFiles('test_data/projects', 'convert/*.ts') }}-${{ needs.setup.outputs.appbuilder_version }}
 
             - name: Run Tests
               run: |