Revert CI spatialite setup

prisma · Oct 3, 2024 · 280a3d3 · 280a3d3
1 parent 128c12d
commit 280a3d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/test-query-engine-template.yml b/.github/workflows/test-query-engine-template.yml
@@ -73,14 +73,16 @@ jobs:
 
       - name: Install Spatialite
         if: ${{ inputs.name == 'spatialite' }}
-        run: sudo apt install -y libsqlite3-mod-spatialite && echo "SPATIALITE_PATH=mod_spatialite" >> $GITHUB_ENV
+        run: sudo apt install -y libsqlite3-mod-spatialite
 
       - run: export WORKSPACE_ROOT=$(pwd) && cargo nextest run -p query-engine-tests --partition hash:${{ matrix.partition }} --test-threads=1
         if: ${{ inputs.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
+          SPATIALITE_PATH: ${{ inputs.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: export WORKSPACE_ROOT=$(pwd) && cargo nextest run -p query-engine-tests --partition hash:${{ matrix.partition }} --test-threads=8
         if: ${{ !inputs.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
+          SPATIALITE_PATH: ${{ inputs.name == 'spatialite' && 'mod_spatialite' || null }}
diff --git a/.github/workflows/test-schema-engine.yml b/.github/workflows/test-schema-engine.yml
@@ -130,7 +130,7 @@ jobs:
 
       - name: Install Spatialite
         if: ${{ matrix.database.name == 'spatialite' }}
-        run: sudo apt install -y libsqlite3-mod-spatialite && echo "SPATIALITE_PATH=mod_spatialite" >> $GITHUB_ENV
+        run: sudo apt install -y libsqlite3-mod-spatialite
 
       - name: "Start ${{ matrix.database.name }}"
         run: make start-${{ matrix.database.name }}
@@ -140,24 +140,28 @@ jobs:
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo nextest run -p sql-schema-describer
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo nextest run -p sql-migration-tests
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       - run: cargo nextest run -p schema-engine-cli
         if: ${{ !matrix.database.single_threaded }}
         env:
           CLICOLOR_FORCE: 1
           TEST_DATABASE_URL: ${{ matrix.database.url }}
+          SPATIALITE_PATH: ${{ matrix.database.name == 'spatialite' && 'mod_spatialite' || null }}
 
       #
       # Vitess tests