Fix CI

Author: mkgrgis

.github/workflows/CI.yml

@@ -24,8 +24,8 @@ jobs:
   test:
     needs: detect-pgversion
     env:
-      SQLITE_VERSION : "3460000"
-      SQLITE_YEAR: "2024"
+      SQLITE_VERSION : "3490000"
+      SQLITE_YEAR: "2025"
       POSTGIS_VERSION : "3.4.2"
       HTTP_PROXY: ""
       HTTPS_PROXY: ""
@@ -73,17 +73,6 @@ jobs:
             bash GitHubActions/build_postgis.sh ${{ matrix.pg }} ${{ env.POSTGIS_VERSION }}
           fi
 
-<<<<<<< HEAD
-=======
-      - name: install SQLite, ${{ matrix.config }} mode
-        run: |
-          if [[ "${{ matrix.config }}" == "default" ]]; then
-            bash GitHubActions/install_sqlite.sh ${{ env.SQLITE_VERSION }} ${{ env.SQLITE_YEAR }} "${{ matrix.config }}"
-          elif [[ "${{ matrix.config }}" == "postgis" ]]; then
-            bash GitHubActions/install_sqlite.sh ${{ env.SQLITE_VERSION }} ${{ env.SQLITE_YEAR }} "${{ matrix.config }}" --enable-rtree
-          fi
-
->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
       - name: build sqlite_fdw, ${{ matrix.config }} mode
         run: |
           bash GitHubActions/build_sqlite_fdw.sh ${{ matrix.pg }} ${{ matrix.config }} ${{ env.SQLITE_FOR_TESTING_DIR }}

GitHubActions/install_sqlite.sh

@@ -5,7 +5,6 @@
 # This sript downloads SQLite source code from the official web site into
 # ./workdir then builds and installs it.
 #
-<<<<<<< HEAD
 # Usage: ./install_sqlite.sh version year testing_mode sqlite_for_testing_dir [configure_options]
 #     version: SQLite version to be installed.
 #     year: A year of SQLite released. It is used for determining a download URL.
@@ -14,15 +13,6 @@
 #     configure_options: are a list of option for sqlite server.
 #
 #     Ex) ./install_sqlite.sh 3420000 2023 postgis /opt/sqlite_for_testing --enable-rtree
-=======
-# Usage: ./install_sqlite.sh version year testing_mode [configure_options]
-#     version: SQLite version to be installed.
-#     year: A year of SQLite released. It is used for determining a download URL.
-#     testing_mode:	'default' or 'postgis' value.
-#     configure_options: are a list of option for sqlite server.
-#
-#     Ex) ./install_sqlite.sh 3420000 2023 postgis --enable-rtree
->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 #
 # Requirements
 # - be able to connect to the SQLite official web site by curl.
@@ -33,19 +23,12 @@
 VERSION="$1"
 YEAR="$2"
 TESTING_MODE="$3"
-<<<<<<< HEAD
 SQLITE_FOR_TESTING_DIR="$4"
-=======
->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 
 CONFIGURE_OPTIONS=""
 
 while (( "$#" )); do
-<<<<<<< HEAD
   CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $5"
-=======
-  CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $4"
->>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
   shift
 done