Adding tapTest and coverage key saves

babelfish-for-postgresql · Jan 16, 2025 · 3d4d66f · 3d4d66f
1 parent 06d0f9f
commit 3d4d66f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/.github/composite-actions/build-modified-postgres/action.yml b/.github/composite-actions/build-modified-postgres/action.yml
@@ -48,26 +48,26 @@ runs:
         cd postgresql_modified_for_babelfish
         rm -rf ~/.ccache
         if [[ ${{inputs.tap_tests}} == "yes" ]]; then
-          echo "CCACHE_KEY=$(git rev-parse --short HEAD)-tapTest" >> $GITHUB_ENV
+          echo "CRESTORE_KEY=$(git rev-parse --short HEAD)-tapTest" >> $GITHUB_ENV
         elif [[ ${{inputs.code_coverage}} == "yes" ]]; then
-          echo "CCACHE_KEY=$(git rev-parse --short HEAD)-coverage" >> $GITHUB_ENV
+          echo "CRESTORE_KEY=$(git rev-parse --short HEAD)-coverage" >> $GITHUB_ENV
         elif [[ ${{inputs.release_mode}} == "yes" ]]; then
-          echo "CCACHE_KEY=$(git rev-parse --short HEAD)-release" >> $GITHUB_ENV
+          echo "CRESTORE_KEY=$(git rev-parse --short HEAD)-release" >> $GITHUB_ENV
         else
-          echo "CCACHE_KEY=$(git rev-parse --short HEAD)-default" >> $GITHUB_ENV
+          echo "CRESTORE_KEY=$(git rev-parse --short HEAD)-default" >> $GITHUB_ENV
         fi
       shell: bash
 
     - uses: actions/cache/restore@v4
       id: restore-ccache
-      if: ${{ github.event_name == 'pull_request' }}
+      if: ${{ github.event_name == 'pull_request' }} || ${{ inputs.code_coverage == 'yes' }}
       with:
         path: 
           ~/.ccache
         key: 
           random-random
         restore-keys: 
-          ${{ env.CCACHE_KEY }}
+          ${{ env.CRESTORE_KEY }}
 
     - name: Save cache if cache hit fails in pull requests
       if: ${{ github.event_name == 'pull_request' }}

diff --git a/.github/composite-actions/save-ccache/action.yml b/.github/composite-actions/save-ccache/action.yml
@@ -2,16 +2,16 @@ name: 'Save Ccache on push'
 
 runs:
   using: "composite"
-  steps:  
+  steps:
 
     - name: Setup new cache key
       if: always()
       run: |
-        echo "CCACHE_KEY=${{env.CCACHE_KEY}}-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        echo "CCACHE_KEY=${{env.CRESTORE_KEY}}-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       shell: bash
 
     - uses: actions/cache/save@v4
-      if: always() && ${{ env.CCACHE_KEY != '' && (github.event_name != 'pull_request' || env.SAVE_CCACHE == 1)}}
+      if: always() && ${{ env.CRESTORE_KEY != '' && (github.event_name != 'pull_request' || env.SAVE_CCACHE == 1)}}
       with:
         path: 
           ~/.ccache

diff --git a/.github/workflows/dotnet-tests.yml b/.github/workflows/dotnet-tests.yml
@@ -40,6 +40,10 @@ jobs:
         id: install-extensions
         if: always() && steps.build-postgis-extension.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
+
+      - name: Save cache
+        if: always() && steps.install-extensions.outcome == 'success'
+        uses: ./.github/composite-actions/save-ccache
 
       - name: Run Dotnet Tests
         id: run-dotnet-tests

diff --git a/.github/workflows/tap-tests.yml b/.github/workflows/tap-tests.yml
@@ -45,7 +45,8 @@ jobs:
         with:
           engine_branch: ${{env.ENGINE_BRANCH_16}}
           install_dir: ${{env.INSTALL_DIR_16}}
-
+
+
       - name: Build Modified Postgres using ${{env.ENGINE_BRANCH_OLD}}
         id: build-modified-postgres-old
         if: always() && steps.build-modified-postgres-16.outcome == 'success'
@@ -100,23 +101,31 @@ jobs:
           sudo make USE_PGXS=1 PG_CONFIG=~/psql_source/bin/pg_config install
         shell: bash
 
+
+
       - name: Build Extensions using ${{env.EXTENSION_BRANCH_OLD}}
         id: build-extensions-old
         if: always() && steps.build-postgis-extension-old.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
         with:
           install_dir: ${{env.OLD_INSTALL_DIR}}
           extension_branch: ${{env.EXTENSION_BRANCH_OLD}}
+
+      - name: Save cache
+        if: always() && steps.build-extensions-old.outcome == 'success'
+        uses: ./.github/composite-actions/save-ccache
 
       - uses: actions/checkout@v2
-
+      
       - name: Build Modified Postgres using latest version
         id: build-modified-postgres-new
         if: always() && steps.build-extensions-old.outcome == 'success'
         uses: ./.github/composite-actions/build-modified-postgres
         with:
           tap_tests: 'yes'
           install_dir: ${{env.NEW_INSTALL_DIR}}
+
+
 
       - name: Compile new ANTLR
         id: compile-new-antlr
@@ -139,6 +148,10 @@ jobs:
         with:
           install_dir: ${{env.NEW_INSTALL_DIR}}
 
+      - name: Save cache
+        if: always() && steps.build-extensions-old.outcome == 'success'
+        uses: ./.github/composite-actions/save-ccache
+
       - name: Run TAP Tests
         id: tap
         if: always() && steps.build-postgis-extension.outcome == 'success'