Skip to content

Fix #206 - Upgrade dependencies and Go to 1.22 #207

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

Merged
merged 5 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
10 changes: 5 additions & 5 deletions .github/workflows/Go-SDK-Check-k8s-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ on:
branches:
- main
env:
GO_VERSION: 1.19
GO_VERSION: 1.22
jobs:
basic_checks:
name: Basic Checks
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
id: go
- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand All @@ -46,7 +46,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: Cache tools
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tools-${{ hashFiles('**/tools.sum') }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/Go-SDK-PR-Check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ on:
branches:
- main
env:
GO_VERSION: 1.19
GO_VERSION: 1.22
jobs:
basic_checks:
name: Basic Checks
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Go ${{ env.GO_VERSION }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
id: go
- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand All @@ -46,7 +46,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: Cache tools
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tools-${{ hashFiles('**/tools.sum') }}
Expand All @@ -67,7 +67,7 @@ jobs:
changed_files=$(git status -s | grep -v 'go.mod\|go.sum\|tools.mod\|tools.sum' || :)
[[ -z "$changed_files" ]] || (printf "Some files are not formatted properly: \n$changed_files\n Did you run 'make test' before sending the PR?" && exit 1)
- name: Check lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: latest
- name: Install cover
Expand All @@ -78,7 +78,7 @@ jobs:
run: |
go test ./... -coverprofile test_coverage.out -covermode=atomic
- name: Upload results to codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./test_coverage.out
flags: sdk-go
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@ fmt:
@go vet ./...
@go fmt ./...

goimports:
@command -v goimports > /dev/null || go install golang.org/x/tools/cmd/goimports@latest
@goimports -w .


lint:
@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin"
make addheaders
make goimports
make fmt
./hack/go-lint.sh ${params}

Expand Down Expand Up @@ -38,7 +44,7 @@ LOCALBIN ?= $(shell pwd)/bin
$(LOCALBIN):
mkdir -p $(LOCALBIN)

CONTROLLER_TOOLS_VERSION ?= v0.9.2
CONTROLLER_TOOLS_VERSION ?= v0.16.3
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
Expand Down
51 changes: 27 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
module github.com/serverlessworkflow/sdk-go/v2

go 1.19
go 1.22.8

toolchain go1.23.1

require (
github.com/go-playground/validator/v10 v10.11.1
github.com/go-playground/validator/v10 v10.16.0
github.com/pkg/errors v0.9.1
github.com/relvacode/iso8601 v1.3.0
github.com/sosodev/duration v1.2.0
github.com/stretchr/testify v1.8.0
github.com/relvacode/iso8601 v1.4.0
github.com/sosodev/duration v1.3.1
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.26.2
sigs.k8s.io/controller-runtime v0.14.4
sigs.k8s.io/yaml v1.3.0
k8s.io/apimachinery v0.31.1
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace golang.org/x/text => golang.org/x/text v0.3.8
Loading
Loading