Skip to content

Commit

Permalink
[Issue #996] Bump Go version to fix pipeline building failure
Browse files Browse the repository at this point in the history
  • Loading branch information
tomqin93 committed Dec 18, 2024
1 parent b789d0a commit 81da604
Show file tree
Hide file tree
Showing 30 changed files with 37 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.23.1"
go-version: "1.23.4"
- name: Install pcap
run: sudo apt-get install libpcap-dev
- name: Run coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.23.1
go-version: 1.23.4
- name: Install pcap
run: sudo apt-get install libpcap-dev
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.23.1"
go-version: "1.23.4"
- name: set version
run: |
echo "VERSION=$(echo "${{inputs.tag_name}}" | cut -d '-' -f1)" >> "$GITHUB_ENV"
Expand Down
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ buildx-push-image-deviceshifu-http-opcua:
-t edgehub/deviceshifu-http-opcua:${IMAGE_VERSION} --push

buildx-push-image-deviceshifu-http-plc4x:
docker buildx build --platform=linux/amd64 -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X \
docker buildx build --platform=linux/amd64,linux/arm64 -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X \
--build-arg PROJECT_ROOT="${PROJECT_ROOT}" ${PROJECT_ROOT} \
-t edgehub/deviceshifu-http-plc4x:${IMAGE_VERSION} --push

Expand Down Expand Up @@ -136,7 +136,9 @@ buildx-push-image-deviceshifu: \
buildx-push-image-deviceshifu-http-socket \
buildx-push-image-deviceshifu-http-opcua \
buildx-push-image-deviceshifu-http-plc4x \
buildx-push-image-deviceshifu-tcp-tcp
buildx-push-image-deviceshifu-tcp-tcp \
buildx-push-image-deviceshifu-http-lwm2m \
buildx-push-image-gateway-lwm2m

buildx-push-image-telemetry-service:
docker buildx build --platform=linux/amd64,linux/arm64,linux/arm -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.telemetryservice \
Expand Down Expand Up @@ -174,7 +176,7 @@ buildx-build-image-deviceshifu-http-opcua:
-t edgehub/deviceshifu-http-opcua:${IMAGE_VERSION} --load

buildx-build-image-deviceshifu-http-plc4x:
docker buildx build --platform=linux/$(shell go env GOARCH) -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X\
docker buildx build --platform=linux/$(shell go env GOARCH),linux/arm64 -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X\
--build-arg PROJECT_ROOT="${PROJECT_ROOT}" ${PROJECT_ROOT} \
-t edgehub/deviceshifu-http-plc4x:${IMAGE_VERSION} --load

Expand Down Expand Up @@ -231,7 +233,9 @@ buildx-build-image-deviceshifu: \
buildx-build-image-deviceshifu-http-socket \
buildx-build-image-deviceshifu-http-opcua \
buildx-build-image-deviceshifu-http-plc4x \
buildx-build-image-deviceshifu-tcp-tcp
buildx-build-image-deviceshifu-tcp-tcp \
buildx-build-image-deviceshifu-http-lwm2m \
buildx-build-image-gateway-lwm2m

buildx-build-image-telemetry-service:
docker buildx build --platform=linux/$(shell go env GOARCH) -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.telemetryservice\
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ variables:
- name: tag
value: ""
- name: goVersion
value: "1.23.1"
value: "1.23.4"

pool:
vmImage: "ubuntu-latest"
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuHTTP
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuLwM2M
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 as builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 as builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuMQTT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuOPCUA
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuPLC4X
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.23.1-alpine AS builder
FROM golang:1.23.4-alpine AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuSocket
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.deviceshifuTCP
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.gatewayLwM2M
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 as builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 as builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.telemetryservice
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.1-alpine AS builder
FROM golang:1.23.4-alpine AS builder
WORKDIR /humidity-detector
COPY humidity-detector.go ./
RUN go mod init humidity-detector
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.1-alpine AS builder
FROM golang:1.23.4-alpine AS builder
WORKDIR /mockserver
COPY *.go ./
RUN go mod init mockserver
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion examples/deviceshifu/hello-world-device/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM golang:1.23.1-alpine
FROM golang:1.23.4-alpine
WORKDIR /app
COPY go.mod ./
RUN go mod download
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM golang:1.23.1-alpine
FROM golang:1.23.4-alpine
WORKDIR /app
COPY go.mod ./
RUN go mod download
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder
WORKDIR /shifu

ENV GO111MODULE=on
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion examples/driver_utils/simple-alpine/Dockerfile.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.1 AS builder
FROM golang:1.23.4 AS builder

WORKDIR /

Expand Down
2 changes: 1 addition & 1 deletion examples/telemetryservice/mockclient/Dockerfile.mockclient
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /mockclient

Expand Down
2 changes: 1 addition & 1 deletion examples/telemetryservice/mockserver/Dockerfile.mockserver
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

WORKDIR /mockserver

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/edgenesis/shifu

go 1.23.1
go 1.23.4

require (
github.com/apache/plc4x/plc4go v0.0.0-20220929155823-14e7d8450c87
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/crd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder

ENV GO111MODULE=on
ENV GOPRIVATE=github.com/Edgenesis
Expand Down

0 comments on commit 81da604

Please sign in to comment.