From bbf6ca1db7187a0edc86f70130cec05eace3a844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 16 Feb 2025 11:49:55 +0100
Subject: [PATCH 1/5] CI: Update nolintlint config
`allow-leading-space: false` is not valid config anymore
```
$ golangci-lint config verify
jsonschema: "linters-settings.nolintlint" does not validate with "/properties/linters-settings/properties/nolintlint/additionalProperties": additionalProperties 'allow-leading-space' not allowed
Failed executing command with error: the configuration contains invalid elements
```
---
.golangci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.golangci.yml b/.golangci.yml
index 11b32fa40..4a08e533b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -21,7 +21,6 @@ linters:
linters-settings:
nolintlint:
allow-unused: false
- allow-leading-space: false
require-specific: true
govet:
From 4e0fd5d06f7cac73b3e57330919729df2b2ffff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 16 Feb 2025 11:57:00 +0100
Subject: [PATCH 2/5] Allow annotations
---
.github/workflows/ci.yml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d07b568d2..581e47a8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,11 @@
name: runTestsAndLinters
on: [push, pull_request]
+permissions:
+ contents: read
+ # Write is needed for golangci-lint annotations
+ checks: write
+
jobs:
test:
strategy:
@@ -17,11 +22,11 @@ jobs:
echo -n "mysqldump -V: " ; mysqldump -V
echo -e '[mysqld]\nserver-id=1\nlog-bin=mysql\nbinlog-format=row\ngtid-mode=ON\nenforce_gtid_consistency=ON\n' | sudo tee /etc/mysql/conf.d/replication.cnf
-
+
# bind to :: for dual-stack listening
sudo sed -i 's/bind-address.*= 127.0.0.1/bind-address = ::/' /etc/mysql/mysql.conf.d/mysqld.cnf
sudo sed -i 's/mysqlx-bind-address.*= 127.0.0.1/mysqlx-bind-address = ::/' /etc/mysql/mysql.conf.d/mysqld.cnf
-
+
sudo service mysql start
# apply this for mysql5 & mysql8 compatibility
@@ -114,6 +119,6 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: "1.23"
-
+
- name: Build on ${{ matrix.os }}/${{ matrix.arch }}
run: GOARCH=${{ matrix.arch }} GOOS=${{ matrix.os }} go build ./...
From 19f0abb15586b442617fe2cd608fe89d7c3715e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 16 Feb 2025 12:27:43 +0100
Subject: [PATCH 3/5] enable problem matches
---
.github/workflows/ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 581e47a8d..23d30ebe5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,6 +101,7 @@ jobs:
with:
version: latest
args: --timeout=3m
+ problem-matchers: true
platforms:
strategy:
From a9aa042979582351def2bfc73a800400b6658202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 16 Feb 2025 12:44:47 +0100
Subject: [PATCH 4/5] Use setup-go
---
.github/workflows/ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23d30ebe5..8c2393ae8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,12 +96,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
+ with:
+ go-version: stable
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: latest
args: --timeout=3m
- problem-matchers: true
platforms:
strategy:
From 0ab5c0458f38d9affc3134b068189d49c7e63e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 16 Feb 2025 12:48:31 +0100
Subject: [PATCH 5/5] Update Go version
---
.github/workflows/ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c2393ae8..aa7a69e9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
- go: [ "1.23", "1.22" ]
+ go: [ "1.24", "1.23", "1.22" ]
os: [ ubuntu-24.04, ubuntu-22.04 ]
name: Tests Go ${{ matrix.go }} on ${{ matrix.os }} # This name is used in main branch protection rules
runs-on: ${{ matrix.os }}
@@ -83,7 +83,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: "1.23"
+ go-version: stable
- name: Run tests
run: |
# separate test to avoid RESET MASTER conflict
@@ -121,7 +121,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: "1.23"
+ go-version: stable
- name: Build on ${{ matrix.os }}/${{ matrix.arch }}
run: GOARCH=${{ matrix.arch }} GOOS=${{ matrix.os }} go build ./...