Make ci-build.sh idempotent

save build to cache before check-test-tx-meta to maximize hits

comment

Remove matrix scenario to get most cache hits in expense of slightly longer CI run

edit

Author: anupsdf

.github/workflows/build.yml

@@ -142,12 +142,24 @@ jobs:
           echo Build with $CC and $CXX
           echo "Running first scenario"
           ./ci-build.sh --use-temp-db --protocol ${{ matrix.protocol }}
-          echo "Running second scenario with --check-test-tx-meta flag"
-          ./ci-build.sh --use-temp-db --protocol ${{ matrix.protocol }} --check-test-tx-meta
 
       # We only _save_ to the cache when we had a cache miss and are running on master.
-      - uses: actions/cache/save@v4
+      - name: Save cache after first build
+        uses: actions/cache/save@v4
         if: ${{ steps.cache.outputs.cache-hit != 'true' && github.ref_name == 'master' }}
         with:
           path: ${{ env.CACHED_PATHS }}
-          key: ${{ steps.cache.outputs.cache-primary-key }}
+          key: ${{ steps.cache.outputs.cache-primary-key }}
+
+      - name: Build for check-test-tx-meta scenario
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          if test "${{ matrix.toolchain }}" = "gcc" ; then
+            export CC='gcc'
+            export CXX='g++'
+          else
+            export CC='clang'
+            export CXX='clang++'
+          fi
+          echo "Running second scenario with --check-test-tx-meta flag"
+          ./ci-build.sh --use-temp-db --protocol ${{ matrix.protocol }} --check-test-tx-meta

ci-build.sh

@@ -69,7 +69,7 @@ echo "Found $NPROCS processors"
 date
 
 # Try to ensure we're using the real g++ and clang++ versions we want
-mkdir bin
+mkdir -p bin
 
 export PATH=`pwd`/bin:$PATH
 echo "PATH is $PATH"
@@ -80,19 +80,19 @@ if test $CXX = 'clang++'; then
     # Use CLANG_VERSION environment variable if set, otherwise default to 12
     CLANG_VER=${CLANG_VERSION:-12}
     which clang-${CLANG_VER}
-    ln -s `which clang-${CLANG_VER}` bin/clang
+    ln -sf `which clang-${CLANG_VER}` bin/clang
     which clang++-${CLANG_VER}
-    ln -s `which clang++-${CLANG_VER}` bin/clang++
+    ln -sf `which clang++-${CLANG_VER}` bin/clang++
     which llvm-symbolizer-${CLANG_VER}
-    ln -s `which llvm-symbolizer-${CLANG_VER}` bin/llvm-symbolizer
+    ln -sf `which llvm-symbolizer-${CLANG_VER}` bin/llvm-symbolizer
     clang -v
     llvm-symbolizer --version || true
 elif test $CXX = 'g++'; then
     RUN_PARTITIONS=$(seq $NPROCS $((2*NPROCS-1)))
     which gcc-10
-    ln -s `which gcc-10` bin/gcc
+    ln -sf `which gcc-10` bin/gcc
     which g++-10
-    ln -s `which g++-10` bin/g++
+    ln -sf `which g++-10` bin/g++
     which g++
     g++ -v
 fi
@@ -165,13 +165,15 @@ if [ $WITH_TESTS -eq 0 ] ; then
 fi
 
 if [ $TEMP_POSTGRES -eq 0 ] ; then
-    # Create postgres databases
+    # Create postgres databases (drop first if they exist to ensure clean state)
     export PGUSER=postgres
+    psql -c "drop database if exists test;" 2>/dev/null || true
     psql -c "create database test;"
     # we run NPROCS jobs in parallel
     for j in $(seq 0 $((NPROCS-1))); do
         base_instance=$((j*50))
         for i in $(seq $base_instance $((base_instance+15))); do
+            psql -c "drop database if exists test$i;" 2>/dev/null || true
             psql -c "create database test$i;"
         done
     done