From 9a915ed23b9605a7e450ce5903e79a59db3a41d7 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 4 Nov 2021 17:32:45 +0100 Subject: [PATCH 1/3] stop met testen tegen PostgreSQL 9.6, begin met testen tegen PostgreSQL 14 met PostGIS 3.1 --- .github/workflows/linux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6f3a3c814f..0996f7e006 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,11 +19,12 @@ jobs: # docker image tags from https://hub.docker.com/r/postgis/postgis/tags?page=1&ordering=last_updated # zie ook https://www.postgresql.org/support/versioning/ postgis: [ - # tot 12-2021 - 9.6-2.5, # tot 12-2022 10-2.5, - 11-3.1, 12-3.1, 13-3.1 + 11-3.1, + 12-3.1, + 13-3.1, + 14-3.1 ] services: From 7eeba8a95eb393fe5f98720cd040e36d0c42ae84 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Thu, 4 Nov 2021 17:33:31 +0100 Subject: [PATCH 2/3] SQL Server testomgeving op Ubuntu 20.04 ipv 18.04 --- .github/workflows/linux-mssql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-mssql.yml b/.github/workflows/linux-mssql.yml index 03dd449456..33e0c10409 100644 --- a/.github/workflows/linux-mssql.yml +++ b/.github/workflows/linux-mssql.yml @@ -8,7 +8,7 @@ env: jobs: build: name: MS SQL ${{ matrix.mssql }} online test - runs-on: [ubuntu-18.04] + runs-on: [ubuntu-20.04] strategy: matrix: mssql: [2019-latest] From 3944f113922ec9436801625b0db622516bdf657f Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Mon, 8 Nov 2021 11:37:32 +0100 Subject: [PATCH 3/3] workaround https://bugs.openjdk.java.net/browse/JDK-8213202 (buggy TLS 1.3 in Java 11.0.2) --- appveyor.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dcd04a91d3..6c039f9d0e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,7 +72,8 @@ install: # initial build/code generation, no testing build_script: - - mvn clean install -Dmaven.test.skip=true -Dtest.onlyITs= -B -V -fae -q -Pmssql -pl "!brmo-dist" %DOCKERHOST% + # the `-Dhttps.protocols=TLSv1.1,TLSv1.2` option is to work around https://bugs.openjdk.java.net/browse/JDK-8213202 (needed for java 11.0.2 which has bugs with TLS 1.3) + - mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 clean install -Dmaven.test.skip=true -Dtest.onlyITs= -B -V -fae -q -Pmssql -pl "!brmo-dist" %DOCKERHOST% # services worden na install gestart en we hebben gegenereerde sql nodig after_build: @@ -111,24 +112,24 @@ after_build: test_script: # unit tests - - if "%OTHER_ITESTS%"=="true" mvn -e -fae -B -Pmssql test -Dtest.persistence.unit=brmo.persistence.microsoftsqlserver -pl "!brmo-dist" %DOCKERHOST% - - if "%OTHER_ITESTS%"=="true" mvn -e -fae -B -Pmssql -pl "datamodel" resources:testResources compiler:testCompile surefire:test -Dtest="!*UpgradeTest,!P8*" + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e -fae -B -Pmssql test -Dtest.persistence.unit=brmo.persistence.microsoftsqlserver -pl "!brmo-dist" %DOCKERHOST% + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e -fae -B -Pmssql -pl "datamodel" resources:testResources compiler:testCompile surefire:test -Dtest="!*UpgradeTest,!P8*" # integratie tests # run integratie tests voor brmo-loader module - - if "%LOADER_ONLY_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-loader" -Dmssql.instancename=%INSTANCENAME% + - if "%LOADER_ONLY_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-loader" -Dmssql.instancename=%INSTANCENAME% # run integratie tests voor bgt-loader module - - if "%BGT_ONLY_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "bgt-loader" -Dmssql.instancename=%INSTANCENAME% + - if "%BGT_ONLY_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "bgt-loader" -Dmssql.instancename=%INSTANCENAME% # run integratie tests voor brmo-service module - - if "%OTHER_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-service" -Dmssql.instancename=%INSTANCENAME% + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-service" -Dmssql.instancename=%INSTANCENAME% # run integratie tests voor brmo-soap module - - if "%OTHER_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-soap" -Dmssql.instancename=%INSTANCENAME% + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-soap" -Dmssql.instancename=%INSTANCENAME% # run integratie tests voor brmo-stufbg204 module - - if "%OTHER_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-stufbg204" -Dmssql.instancename=%INSTANCENAME% + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-stufbg204" -Dmssql.instancename=%INSTANCENAME% # run integratie tests voor brmo-commandline module - - if "%OTHER_ITESTS%"=="true" mvn -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-commandline" -Dmssql.instancename=%INSTANCENAME% + - if "%OTHER_ITESTS%"=="true" mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 -e verify -B -Pmssql -Dtest.onlyITs=true -pl "brmo-commandline" -Dmssql.instancename=%INSTANCENAME% after_test: - - mvn clean build-helper:remove-project-artifact + - mvn -Dhttps.protocols=TLSv1.1,TLSv1.2 clean build-helper:remove-project-artifact on_success: # report code coverage