Skip to content

Commit 6554cec

Browse files
committed
chore(ci): read Go version from go.mod toolchain directive (#126)
Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent 9104c9f commit 6554cec

4 files changed

Lines changed: 4 additions & 17 deletions

File tree

.github/workflows/continuous-delivery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
echo "PG_IMAGE=$(echo "${BUILD_METADATA}" | jq -r '.["minimal"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
9292
9393
call-reusable-e2e:
94-
if: github.event_name == 'schedule'
94+
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
9595
needs:
9696
- build-pg
9797
uses: ./.github/workflows/reusable-e2e.yml

.github/workflows/reusable-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ on:
2727

2828
# set up environment variables to be used across all the jobs
2929
env:
30-
GOLANG_VERSION: "1.26.x"
3130
KIND_VERSION: "v0.31.0"
3231
K8S_VERSION: "v1.35.1"
3332
REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
@@ -100,7 +99,8 @@ jobs:
10099
- name: Install Go
101100
uses: actions/setup-go@v6
102101
with:
103-
go-version: ${{ env.GOLANG_VERSION }}
102+
go-version-file: go.mod
103+
check-latest: true
104104

105105
- name: Set GoReleaser environment
106106
run: |

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ USER 26
126126
FROM standard AS postgis
127127
USER root
128128
ARG POSTGIS_REPO=https://github.com/postgis/postgis.git
129-
ARG POSTGIS_BRANCH=master
129+
ARG POSTGIS_BRANCH=stable-3.6
130130

131131
RUN apt-get update && \
132132
apt-get install -y --no-install-recommends \

renovate.json

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@
2828
"datasourceTemplate": "docker",
2929
"versioningTemplate": "loose",
3030
"depNameTemplate": "kindest/node"
31-
},
32-
{
33-
"customType": "regex",
34-
"managerFilePatterns": [
35-
"/^\\.github\\/workflows\\/[^/]+\\.ya?ml$/"
36-
],
37-
"matchStrings": [
38-
"GOLANG_VERSION: \"(?<currentValue>.*?)\\.x\""
39-
],
40-
"datasourceTemplate": "golang-version",
41-
"depNameTemplate": "golang",
42-
"versioningTemplate": "loose",
43-
"extractVersionTemplate": "^(?<version>\\d+\\.\\d+)"
4431
}
4532
]
4633
}

0 commit comments

Comments
 (0)