From 64d10c428f98d3479214d0fb5e98b411177040bd Mon Sep 17 00:00:00 2001 From: Ivar Derksen Date: Tue, 19 Mar 2024 12:30:54 +0100 Subject: [PATCH 1/2] CI/CD: fix sqlserver tests in GH Actions workflow --- CHANGELOG.md | 3 +++ docker-compose.yml | 4 ++-- internal/sessiontest/revocation_test.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e04a61..b36d12f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Internal +- Fix sqlserver tests in GitHub Actions workflow + ## [0.15.1] - 2023-12-18 ### Fixed - `RemoveScheme` function in `irmaclient` already stripping storage before checking whether the scheme is in assets diff --git a/docker-compose.yml b/docker-compose.yml index 21357e9e..4decff61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,10 +45,10 @@ services: image: kcollins/mssql:2019-latest environment: ACCEPT_EULA: Y # Confirms your acceptance of the End-User Licensing Agreement. - SA_PASSWORD: test-Password # Include dash and uppercase letter to meet password requirements. + MSSQL_RANDOM_SA_PASSWORD: Y MSSQL_DATABASE: test MSSQL_USER: testuser - MSSQL_PASSWORD: test-Password + MSSQL_PASSWORD: testpassword MSSQL_PID: Developer ports: - 1433:1433 diff --git a/internal/sessiontest/revocation_test.go b/internal/sessiontest/revocation_test.go index 905d5538..cd1ef2b2 100644 --- a/internal/sessiontest/revocation_test.go +++ b/internal/sessiontest/revocation_test.go @@ -34,7 +34,7 @@ var ( revocationDbStrs = map[string]string{ "postgres": "host=127.0.0.1 port=5432 user=testuser dbname=test password='testpassword' sslmode=disable", "mysql": "testuser:testpassword@tcp(127.0.0.1)/test", - "sqlserver": "sqlserver://testuser:test-Password@127.0.0.1:1433?database=test", + "sqlserver": "sqlserver://testuser:testpassword@127.0.0.1:1433?database=test", } revocationPkCounter uint = 2 From 15ac721506bfe3db5b3136d828269c4b22ffbdd8 Mon Sep 17 00:00:00 2001 From: Ivar Derksen Date: Tue, 19 Mar 2024 12:32:36 +0100 Subject: [PATCH 2/2] Chore: update go toolchain to 1.22.1 --- CHANGELOG.md | 3 +++ go.mod | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b36d12f1..12c25b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Security +- Update go toolchain to 1.22.1 + ### Internal - Fix sqlserver tests in GitHub Actions workflow diff --git a/go.mod b/go.mod index 5a19cd53..355875c5 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/privacybydesign/irmago go 1.21 -toolchain go1.21.5 +toolchain go1.22.1 require ( github.com/alexandrevicenzi/go-sse v1.6.0