redo how queries are cached

erik-krogh · erik-krogh · commit f4604ce9f57b · 2022-08-15T22:37:15.000+02:00
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
@@ -27,29 +27,6 @@ jobs:
         shell: bash
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
-      - name: Cache queries
-        id: cache-queries
-        uses: actions/cache@v3
-        with:
-          path: ${{ runner.temp }}/query-pack.zip
-          key: queries-${{ hashFiles('ql/**/*.ql*') }}-${{ hashFiles('ql/**/qlpack.yml') }}-${{ hashFiles('ql/ql/src/ql.dbscheme*') }}-${{ steps.get-codeql-version.outputs.version }}
-      - name: Build query pack
-        if: steps.cache-queries.outputs.cache-hit != 'true'
-        run: |
-          cd ql/ql/src
-          "${CODEQL}" pack create
-          cd .codeql/pack/codeql/ql/0.0.0
-          zip "${PACKZIP}" -r .
-          rm -rf *
-        env:
-          CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
-          PACKZIP: ${{ runner.temp }}/query-pack.zip
-      - name: Upload query pack
-        uses: actions/upload-artifact@v3
-        with:
-          name: query-pack-zip
-          path: ${{ runner.temp }}/query-pack.zip
-
       ### Build the extractor ###
       - name: Cache entire extractor
         id: cache-extractor
@@ -95,17 +72,13 @@ jobs:
             ql/target/release/ql-extractor.exe
           retention-days: 1
 
-      ### Package the queries and extractor ###
-      - uses: actions/download-artifact@v3
-        with:
-          name: query-pack-zip
-          path: query-pack-zip
+      ### Package the extractor ###
       - uses: actions/download-artifact@v3
         with:
           name: extractor-ubuntu-latest
           path: linux64
       - run: |
-          unzip query-pack-zip/*.zip -d pack
+          mkdir pack
           cp -r ql/codeql-extractor.yml ql/tools ql/ql/src/ql.dbscheme.stats pack/
           mkdir -p pack/tools/linux64
           if [[ -f linux64/ql-autobuilder ]]; then
@@ -164,6 +137,13 @@ jobs:
           db-location: ${{ runner.temp }}/db
           config-file: ./ql-for-ql-config.yml
 
+      - name: Cache queries
+        id: cache-queries
+        uses: actions/cache@v3
+        with:
+          path: ql/ql/src/.cache
+          key: queries-${{ hashFiles('ql/**/*.ql*') }}-${{ hashFiles('ql/**/qlpack.yml') }}-${{ hashFiles('ql/ql/src/ql.dbscheme*') }}-${{ steps.get-codeql-version.outputs.version }}
+
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@71a8b35ff4c80fcfcd05bc1cd932fe3c08f943ca
         with: 
