Skip to content

Commit 2ea02c1

Browse files
authored
Update the golang version and disable the flaky mirror setup for RockyLinux (#2379)
1 parent 3f772ae commit 2ea02c1

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.24.6
21+
go-version: 1.24.9
2222
- name: Get dependencies
2323
run: curl -L --fail "https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb" -o fdb.deb
2424
- name: Install dependencies
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Go
4343
uses: actions/setup-go@v4
4444
with:
45-
go-version: 1.24.6
45+
go-version: 1.24.9
4646
- name: Fetch all tags
4747
run: git fetch --force --tags
4848
- name: Get dependencies
@@ -101,7 +101,7 @@ jobs:
101101
- name: Set up Go
102102
uses: actions/setup-go@v4
103103
with:
104-
go-version: 1.24.6
104+
go-version: 1.24.9
105105
- name: Fetch all tags
106106
run: git fetch --force --tags
107107
- name: Get dependencies

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up Go
4444
uses: actions/setup-go@v4
4545
with:
46-
go-version: 1.24.6
46+
go-version: 1.24.9
4747
# https://github.com/goreleaser/goreleaser/issues/1311
4848
- name: Get current semver tag
4949
run: echo "GORELEASER_CURRENT_TAG=$(git describe --tags --match "v*" --abbrev=0)" >> $GITHUB_ENV

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG FDB_VERSION=7.1.67
44
ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
55

66
# Build the manager binary
7-
FROM docker.io/library/golang:1.24.6-bookworm AS builder
7+
FROM docker.io/library/golang:1.24.9-bookworm AS builder
88

99
ARG FDB_VERSION
1010
ARG FDB_WEBSITE
@@ -17,7 +17,7 @@ RUN set -eux && \
1717
elif [ "$TARGETARCH" = "arm64" ]; then \
1818
FDB_ARCH=aarch64; \
1919
if [ "${FDB_VERSION%.*}" = "7.1" ]; then \
20-
FDB_VERSION="7.3.63"; \
20+
FDB_VERSION="7.3.71"; \
2121
fi; \
2222
else \
2323
echo "ERROR: unsupported architecture $TARGETARCH" 1>&2; \
@@ -75,7 +75,7 @@ RUN set -eux && \
7575
elif [ "$TARGETARCH" = "arm64" ]; then \
7676
FDB_ARCH=aarch64; \
7777
if [ "${FDB_VERSION%.*}" = "7.1" ]; then \
78-
FDB_VERSION="7.3.63"; \
78+
FDB_VERSION="7.3.71"; \
7979
fi; \
8080
else \
8181
echo "ERROR: unsupported architecture $TARGETARCH" 1>&2; \
@@ -89,7 +89,9 @@ RUN set -eux && \
8989
fi; \
9090
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm" -o foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm && \
9191
curl --fail -L "${FDB_WEBSITE}/${FDB_VERSION}/foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm.sha256" -o foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm.sha256 && \
92-
microdnf install -y glibc pkg-config bind-utils && \
92+
# Disable buggy mirrors for RockyLinux.
93+
sed -i.bak 's/^#baseurl=/baseurl=/; s/^mirrorlist=/#mirrorlist=/' /etc/yum.repos.d/rocky.repo && \
94+
microdnf install --disablerepo=* --enablerepo=baseos --enablerepo=appstream -y glibc pkg-config bind-utils && \
9395
microdnf clean all && \
9496
sha256sum -c foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm.sha256 && \
9597
rpm -i foundationdb-clients-${FDB_VERSION}-1.${FDB_OS}.${FDB_ARCH}.rpm --excludepath=/usr/bin --excludepath=/usr/lib/foundationdb/backup_agent && \

0 commit comments

Comments
 (0)