Skip to content

Commit e56706c

Browse files
authored
upgrade golang to 1.23.6 (#231)
* upgrade golang to 1.23.6 * rename rpmversion to avoid conflict with build-in micro
1 parent d725b72 commit e56706c

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.github/workflows/continuous-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup Go
3333
uses: actions/setup-go@v2
3434
with:
35-
go-version: '^1.22.4'
35+
go-version: '^1.23.6'
3636

3737
- uses: actions/cache@v2
3838
with:

.github/workflows/release-build-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@v2
2424
with:
25-
go-version: '^1.22.4'
25+
go-version: '^1.23.6'
2626

2727
- uses: actions/cache@v2
2828
with:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM --platform=$BUILDPLATFORM golang:1.22.4-alpine AS build-env
2+
FROM --platform=$BUILDPLATFORM golang:1.23.6-alpine AS build-env
33
ARG TARGETPLATFORM
44

55
RUN apk update && apk add ca-certificates

Dockerfile.amazonlinux

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM --platform=$BUILDPLATFORM golang:1.22.4-alpine AS build-env
2+
FROM --platform=$BUILDPLATFORM golang:1.23.6-alpine AS build-env
33
ARG TARGETPLATFORM
44

55
RUN apk update && apk add ca-certificates

Tool/src/packaging/linux/build_rpm_linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cp ${BGO_SPACE}/THIRD-PARTY-LICENSES.txt ${BGO_SPACE}/bin/linux_${ARCH}/linux/et
3838
echo "Creating the rpm package"
3939
SPEC_FILE="${BGO_SPACE}/Tool/src/packaging/linux/xray.spec"
4040
BUILD_ROOT="${BGO_SPACE}/bin/linux_${ARCH}/linux"
41-
rpmbuild --target ${BUILD_ARCH}-linux --define "rpmversion ${VERSION}" --define "_topdir bin/linux_${ARCH}/linux/rpmbuild" -bb --buildroot ${BUILD_ROOT} ${SPEC_FILE}
41+
rpmbuild --target ${BUILD_ARCH}-linux --define "rpmver ${VERSION}" --define "_topdir bin/linux_${ARCH}/linux/rpmbuild" -bb --buildroot ${BUILD_ROOT} ${SPEC_FILE}
4242

4343
echo "Copying rpm files to bin"
4444
cp ${BGO_SPACE}/bin/linux_${ARCH}/linux/rpmbuild/RPMS/${BUILD_ARCH}/*.rpm ${BGO_SPACE}/build/dist/aws-xray-daemon-linux-${ARCH}-${VERSION}.rpm

Tool/src/packaging/linux/xray.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: xray
2-
Version: %rpmversion
2+
Version: %rpmver
33
Release: 1
44
Summary: X-Ray daemon
55

0 commit comments

Comments
 (0)