Merge pull request #276 from seriyps/upgrade-ci-versions

CI: add OTP-25, remove OTP-19, add PostgreSQL 14, 15

.github/workflows/ci.yml

@@ -16,22 +16,38 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - "ubuntu-20.04"
+          - "ubuntu-22.04"
         pg:
-          - 12
+          - 14
         postgis:
-          - 3
+          - "3"
         otp:
-          - "24.0"
-          - "23.3"
-          - "22.3"
-          - "21.3"
-          - "20.3"
+          - "25.2"
+          - "24.3"
+        rebar3:
+          - "3.20.0"
         include:
-          - otp: "19.3"
-            os: "ubuntu-18.04"
-            pg: 10
-            postgis: "2.4"
+          - os: "ubuntu-20.04"
+            otp: "23.3"
+            rebar3: "3.17.0"
+            pg: "12"
+            postgis: "3"
+          - os: "ubuntu-20.04"
+            otp: "22.3"
+            rebar3: "3.17.0"
+            pg: "12"
+            postgis: "3"
+          - os: "ubuntu-20.04"
+            otp: "21.3"
+            rebar3: "3.15.2"
+            pg: "12"
+            postgis: "3"
+          - os: "ubuntu-20.04"
+            otp: "20.3"
+            rebar3: "3.15.2"
+            pg: "12"
+            postgis: "3"
+
     # env:
     #   PATH: ".:/usr/lib/postgresql/12/bin:$PATH"
     env:
@@ -42,6 +58,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{matrix.otp}}
+          rebar3-version: ${{ matrix.rebar3 }}
 
       - name: Setup postgresql server with postgis
         run: sudo apt install postgresql-${{matrix.pg}} postgresql-contrib-${{matrix.pg}} postgresql-${{matrix.pg}}-postgis-${{matrix.postgis}} postgresql-${{matrix.pg}}-postgis-${{matrix.postgis}}-scripts

Makefile

@@ -1,16 +1,12 @@
-REBAR = ./rebar3
+REBAR = rebar3
 MINIMAL_COVERAGE = 55
 
 all: compile
 
-$(REBAR):
-	wget https://github.com/erlang/rebar3/releases/download/3.15.2/rebar3
-	chmod +x rebar3
-
-compile: src/epgsql_errcodes.erl $(REBAR)
+compile: src/epgsql_errcodes.erl
 	@$(REBAR) compile
 
-clean: $(REBAR)
+clean:
 	@$(REBAR) clean
 	@rm -f doc/*.html
 	@rm -f doc/erlang.png
@@ -35,10 +31,10 @@ test: compile eunit common-test cover
 dialyzer: compile
 	@$(REBAR) dialyzer
 
-elvis: $(REBAR)
+elvis:
 	@$(REBAR) as lint lint
 
-edoc: $(REBAR)
+edoc:
 	@$(REBAR) edoc
 
 .PHONY: all compile clean common-test eunit cover test dialyzer elvis