Skip to content

Commit

Permalink
Merge pull request #1871 from openziti/update-go-version
Browse files Browse the repository at this point in the history
Update Go version to 1.22.x
  • Loading branch information
plorenz authored Mar 25, 2024
2 parents f424b55 + 7f0e7b9 commit 4e75b2c
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ updates:
- "minor"
- "patch"
patterns:
- "openziti"
- "*openziti*"

third-party:
applies-to: version-updates
update-types:
- "minor"
- "patch"
exclude-patterns:
- "openziti"
- "rabbitmq"
- "blackfriday"
- "zitadel"
- "*openziti*"
- "*rabbitmq*"
- "*blackfriday*"
- "*zitadel*"

- package-ecosystem: github-actions
directory: "/"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fablab-db-creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
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 @@ -19,7 +19,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- uses: actions/checkout@v4

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -301,7 +301,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down Expand Up @@ -416,7 +416,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Python
uses: actions/setup-python@v5
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
shell: bash
run: sudo apt-get update && sudo apt-get install --yes zsh

- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.x'

- name: Build and run a quickstart container image
shell: bash
run: ./quickstart/test/compose-test.zsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Install Ziti CI
uses: openziti/ziti-ci@v1
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Release 0.34.1

## What's New

* Updates version of go to 1.22.x
* As usual when updating the go version, this is the only change in this release

# Release 0.34.0

## What's New
Expand Down
2 changes: 1 addition & 1 deletion dist/docker-images/cross-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM debian:bullseye-slim
#

ARG TARGETARCH
ARG golang_version=1.21.5
ARG golang_version=1.22.1
ARG go_distribution_file=go${golang_version}.linux-${TARGETARCH}.tar.gz
ARG go_path=/usr/share/go
ARG go_root=/usr/local/go
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/openziti/ziti

go 1.21
go 1.22

require (
github.com/AppsFlyer/go-sundheit v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion quickstart/docker/all-in-one/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Change `Dockerfile` like this, and run `ZITI_QUICK_TAG=local docker compose up -
checked-out source tree and run the quickstart with the build.
```dockerfile
FROM golang:1.21-bookworm AS builder
FROM golang:1.22-bookworm AS builder
ARG ARTIFACTS_DIR=./build
WORKDIR /app
COPY go.mod go.sum ./
Expand Down
6 changes: 5 additions & 1 deletion quickstart/docker/createLocalImage.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash
set -euo pipefail

set -o errexit
set -o nounset
set -o pipefail
# set -o xtrace

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
ZITI_BIN="${SCRIPT_DIR}/image/ziti-bin"
Expand Down
2 changes: 1 addition & 1 deletion zititest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openziti/ziti/zititest

go 1.21
go 1.22

replace github.com/openziti/ziti => ../

Expand Down

0 comments on commit 4e75b2c

Please sign in to comment.