Test GitHub Actions

brick · Dec 14, 2020 · b9a95d1 · b9a95d1
1 parent 81b4dd4
commit b9a95d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
           coverage: xdebug
 
       - name: Install composer dependencies
-        run: composer install --no-interaction --no-progress --no-suggest
+        uses: "ramsey/composer-install@v1"
 
       - name: Run PHPUnit
         run: vendor/bin/phpunit
@@ -88,7 +88,7 @@ jobs:
           coverage: xdebug
 
       - name: Install composer dependencies
-        run: composer install --no-interaction --no-progress --no-suggest
+        uses: "ramsey/composer-install@v1"
 
       - name: Run PHPUnit with coverage
         run: |
@@ -158,23 +158,18 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
+          extensions: geos
           coverage: xdebug
 
-      - name: Install GEOS
-        run: bash ci/install-geos.sh
-
-      - name: Setup Debug Session
-        uses: csexton/debugger-action@master
-
       - name: Install composer dependencies
-        run: composer install --no-interaction --no-progress --no-suggest
+        uses: "ramsey/composer-install@v1"
 
       - name: Run PHPUnit with coverage
         run: |
           mkdir -p mkdir -p build/logs
           vendor/bin/phpunit --coverage-clover build/logs/clover.xml
         env:
-          ENGINE: SQLite3
+          ENGINE: GEOS
 
       - name: Upload coverage report to Coveralls
         run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v

diff --git a/ci/install-geos.sh b/ci/install-geos.sh
@@ -8,20 +8,18 @@ sudo apt autoremove
 
 wget https://github.com/libgeos/geos/archive/$GEOS_VERSION.tar.gz
 tar zxf $GEOS_VERSION.tar.gz
-cd geos-$GEOS_VERSION
+mv geos-$GEOS_VERSION geos
+cd geos
 ./autogen.sh
 ./configure --prefix=/usr
 make
-sudo make install
 cd ..
 
 wget https://github.com/libgeos/php-geos/archive/$PHP_GEOS_VERSION.tar.gz
 tar zxf $PHP_GEOS_VERSION.tar.gz
-cd php-geos-$PHP_GEOS_VERSION
+mv php-geos-$PHP_GEOS_VERSION php-geos
+cd php-geos
 ./autogen.sh
 ./configure
 make
-sudo mv modules/geos.so $(php-config --extension-dir)
 cd ..
-
-echo "extension=geos.so" > geos.ini