Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated the go version to 1.22 #833

Merged
merged 11 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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@v3
- uses: actions/setup-go@v2
with:
go-version: "1.20.2"
go-version: "1.22.0"
- 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@v3
with:
go-version: 1.20.2
go-version: 1.22.0
- name: Install pcap
run: sudo apt-get install libpcap-dev
- uses: actions/checkout@v3
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@v2
- uses: actions/setup-go@v4
with:
go-version: "1.20.2"
go-version: "1.22.0"
- name: set version
run: |
echo "VERSION=$(echo "${{inputs.tag_name}}" | cut -d '-' -f1)" >> "$GITHUB_ENV"
Expand Down
22 changes: 20 additions & 2 deletions azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ stages:
steps:
- task: GoTool@0
inputs:
version: '1.20.2'
version: '1.22.0'
- task: Go@0
displayName: "go get"
inputs:
Expand All @@ -67,7 +67,7 @@ stages:
steps:
- task: GoTool@0
inputs:
version: '1.20.2'
version: '1.22.0'
- task: Go@0
displayName: "go get"
inputs:
Expand All @@ -87,6 +87,9 @@ stages:

- job: kind_e2e_test_http
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
Expand Down Expand Up @@ -165,6 +168,9 @@ stages:

- job: kind_e2e_test_opcua
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
Expand Down Expand Up @@ -205,6 +211,9 @@ stages:

- job: kind_e2e_test_socket
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
Expand Down Expand Up @@ -245,6 +254,9 @@ stages:

- job: kind_e2e_test_mqtt
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
Expand Down Expand Up @@ -281,6 +293,9 @@ stages:

- job: kind_e2e_test_customized
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
Expand Down Expand Up @@ -332,6 +347,9 @@ stages:

- job: build_test_plc4x
steps:
- task: GoTool@0
inputs:
version: '1.22.0'
- script: |
tag=`cat version.txt` && echo "##vso[task.setvariable variable=tag]$tag"
displayName: Set the tag name as an environment variable
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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 as builder

WORKDIR /shifu

Expand Down
2 changes: 1 addition & 1 deletion docs/development/develop-deviceshifu.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ The dockerfile, take `MQTT` as example, can be:

```dockerfile
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.20.4 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 as builder

WORKDIR /shifu

Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-linux-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ git clone https://github.com/Edgenesis/shifu.git
从 [Go](https://go.dev/doc/install) 官网, 利用下面的命令下载并安装:

```bash
wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
```

Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Click on that, VSCode should open your project in remote container. Your develop
From [Go](https://go.dev/doc/install), download and install go using the following command:

```bash
wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
```

Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-mac-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ git clone https://github.com/Edgenesis/shifu.git

运行 英特尔(amd64) 的 Mac:
```
https://go.dev/dl/go1.20.2.darwin-amd64.pkg
https://go.dev/dl/go1.22.0.darwin-amd64.pkg
```
运行 M1(arm64) 的 Mac:
```
https://go.dev/dl/go1.20.2.darwin-arm64.pkg
https://go.dev/dl/go1.22.0.darwin-arm64.pkg
```

### 1.6 安装 `kind`
Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ Depending on your Mac's CPU architecture, you can download one of the following

For Intel(amd64) Macs:
```
https://go.dev/dl/go1.20.2.darwin-amd64.pkg
https://go.dev/dl/go1.22.0.darwin-amd64.pkg
```
For M1(arm64) Macs:
```
https://go.dev/dl/go1.20.2.darwin-arm64.pkg
https://go.dev/dl/go1.22.0.darwin-arm64.pkg
```

### 1.6 Install `kind`
Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-windows-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ git clone https://github.com/Edgenesis/shifu.git
### 1.6 安装 `Go`
从 [Go](https://go.dev/doc/install) 官网, 利用下面的命令下载并安装:
```bash
$ wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
$ rm -rf /usr/local/go && tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
$ wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
$ rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
$ echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
```

Expand Down
4 changes: 2 additions & 2 deletions docs/development/develop-on-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ Click on that, VSCode should open your project in remote container. Your develop
### 1.6 Install `Go`
From [Go](https://go.dev/doc/install), download and install go using the following command:
```bash
$ wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
$ rm -rf /usr/local/go && tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
$ wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
$ rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
$ echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.2-alpine AS builder
FROM golang:1.22.0-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.20.2-alpine AS builder
FROM golang:1.22.0-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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2-alpine
FROM golang:1.22.0-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.20.2-alpine
FROM golang:1.22.0-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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20.2 as builder
FROM golang:1.22.0 as builder

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 as builder

WORKDIR /mockclient

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.20.2 as builder
FROM --platform=$BUILDPLATFORM golang:1.22.0 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.20
go 1.22

require (
github.com/apache/plc4x/plc4go v0.0.0-20220929155823-14e7d8450c87
Expand Down
Loading
Loading