From 8a95e7359ae6648577cffd87348c850d59731198 Mon Sep 17 00:00:00 2001 From: chris-j-h Date: Tue, 11 Jun 2024 14:09:14 +0100 Subject: [PATCH 1/3] Update builder base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d591fa9f6c..9b0d8f4263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VERSION="" ARG BUILDNUM="" # Build Geth in a stock Go builder container -FROM golang:1.21-alpine as builder +FROM golang:1.22-alpine as builder RUN apk add --no-cache gcc musl-dev linux-headers git From 361cd4264af15531aafc8fb954b45cd5f953b98f Mon Sep 17 00:00:00 2001 From: chris-j-h Date: Tue, 11 Jun 2024 14:11:27 +0100 Subject: [PATCH 2/3] Update development version to 24.4.1 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index c6bd774a7a..eeadb5bf72 100644 --- a/params/version.go +++ b/params/version.go @@ -28,7 +28,7 @@ const ( QuorumVersionMajor = 24 QuorumVersionMinor = 4 - QuorumVersionPatch = 0 + QuorumVersionPatch = 1 ) // Version holds the textual version string. From d7b8ec13f80b44df7b1fb8f20b9984efd83b2e33 Mon Sep 17 00:00:00 2001 From: chris-j-h Date: Tue, 11 Jun 2024 15:59:24 +0100 Subject: [PATCH 3/3] Add debugging help to workflow --- .github/workflows/pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bf30a4fa6a..1a7c4b1168 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -150,7 +150,9 @@ jobs: echo "::set-output name=dockerEnvFile::$docker_env_file" - name: 'Run acceptance tests' run: | + echo ${{ steps.setup.outputs.dockerEnvFile }} cat ${{ steps.setup.outputs.dockerEnvFile }} + echo "docker run..." docker run --rm \ --network host \ -v /var/run/docker.sock:/var/run/docker.sock \ @@ -161,6 +163,7 @@ jobs: -Dauto.outputDir=${{ steps.setup.outputs.outputDir }} \ -Dtags="${{ matrix.tag }}" - name: 'Debug' + if: always() run: | docker images docker ps -a