diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7431f3fe6..051529104 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,7 +12,7 @@ updates: - "minor" - "patch" patterns: - - "openziti" + - "*openziti*" third-party: applies-to: version-updates @@ -20,10 +20,10 @@ updates: - "minor" - "patch" exclude-patterns: - - "openziti" - - "rabbitmq" - - "blackfriday" - - "zitadel" + - "*openziti*" + - "*rabbitmq*" + - "*blackfriday*" + - "*zitadel*" - package-ecosystem: github-actions directory: "/" diff --git a/.github/workflows/fablab-db-creation.yml b/.github/workflows/fablab-db-creation.yml index 4f95364a2..1aa1ab31d 100644 --- a/.github/workflows/fablab-db-creation.yml +++ b/.github/workflows/fablab-db-creation.yml @@ -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 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 34dc0fc90..b71f1cc34 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b02fb5f1..e55969948 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/test-quickstart.yml b/.github/workflows/test-quickstart.yml index f1fa38699..bb622b378 100644 --- a/.github/workflows/test-quickstart.yml +++ b/.github/workflows/test-quickstart.yml @@ -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 diff --git a/.github/workflows/update-dependency.yml b/.github/workflows/update-dependency.yml index e7218f65d..8c351d5e0 100644 --- a/.github/workflows/update-dependency.yml +++ b/.github/workflows/update-dependency.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c612182..b12e8338e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/dist/docker-images/cross-build/Dockerfile b/dist/docker-images/cross-build/Dockerfile index 9507d7d80..6c5195907 100644 --- a/dist/docker-images/cross-build/Dockerfile +++ b/dist/docker-images/cross-build/Dockerfile @@ -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 diff --git a/go.mod b/go.mod index 3c6d55450..e17d8bff2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openziti/ziti -go 1.21 +go 1.22 require ( github.com/AppsFlyer/go-sundheit v0.5.0 diff --git a/quickstart/docker/all-in-one/README.md b/quickstart/docker/all-in-one/README.md index 78f430c9d..c39a05ecb 100644 --- a/quickstart/docker/all-in-one/README.md +++ b/quickstart/docker/all-in-one/README.md @@ -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 ./ diff --git a/quickstart/docker/createLocalImage.sh b/quickstart/docker/createLocalImage.sh index e349c60b3..101e8db3c 100755 --- a/quickstart/docker/createLocalImage.sh +++ b/quickstart/docker/createLocalImage.sh @@ -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" diff --git a/zititest/go.mod b/zititest/go.mod index ec19d3fe1..a0ab939b6 100644 --- a/zititest/go.mod +++ b/zititest/go.mod @@ -1,6 +1,6 @@ module github.com/openziti/ziti/zititest -go 1.21 +go 1.22 replace github.com/openziti/ziti => ../