From d89e492c2f4b241552bb710e2ac257b7b272c5d5 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Wed, 25 Dec 2024 14:02:55 -0800 Subject: [PATCH] Bump Go to 1.23.4 --- .github/workflows/master.yml | 4 ++-- .github/workflows/re-release.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- Dockerfile | 2 +- go.mod | 8 +++----- go.sum | 8 ++++---- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 068a518..53e800f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -17,10 +17,10 @@ jobs: with: fetch-depth: 0 - - name: Set up Go 1.23.0 + - name: Set up Go 1.23.4 uses: actions/setup-go@v5 with: - go-version: '1.23.0' + go-version: '1.23.4' - name: Start MongoDB uses: supercharge/mongodb-github-action@1.11.0 diff --git a/.github/workflows/re-release.yml b/.github/workflows/re-release.yml index d0a67d6..dfdcb4f 100644 --- a/.github/workflows/re-release.yml +++ b/.github/workflows/re-release.yml @@ -20,10 +20,10 @@ jobs: fetch-depth: 0 ref: ${{ github.event.inputs.tag }} - - name: Set up Go 1.23.0 + - name: Set up Go 1.23.4 uses: actions/setup-go@v5 with: - go-version: '1.23.0' + go-version: '1.23.4' - name: Start MongoDB uses: supercharge/mongodb-github-action@1.11.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 942950e..8efb26c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,10 @@ jobs: with: fetch-depth: 0 - - name: Set up Go 1.23.0 + - name: Set up Go 1.23.4 uses: actions/setup-go@v5 with: - go-version: '1.23.0' + go-version: '1.23.4' - name: Start MongoDB uses: supercharge/mongodb-github-action@1.11.0 diff --git a/Dockerfile b/Dockerfile index 6e5764c..678aea0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1-alpine AS builder +FROM golang:1.23.4-alpine AS builder WORKDIR /app COPY . . diff --git a/go.mod b/go.mod index 32d1c22..cc34feb 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/switcherapi/switcher-gitops -go 1.23 - -toolchain go1.23.0 +go 1.23.4 require ( github.com/go-git/go-billy/v5 v5.6.0 @@ -39,7 +37,7 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect golang.org/x/crypto v0.31.0 // indirect - golang.org/x/net v0.32.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect @@ -47,4 +45,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20241218172127-ac55c7698e0d +replace github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20241224112848-b717bebf1f4e diff --git a/go.sum b/go.sum index 847ef6f..cddf4c3 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/elazarl/goproxy v0.0.0-20241218172127-ac55c7698e0d h1:r8DboPPvhhSMCWfmBEDoLuNvHetXH8/AZUdaRLNYgXE= -github.com/elazarl/goproxy v0.0.0-20241218172127-ac55c7698e0d/go.mod h1:3TKt+OFpElWuCtt5bphUyO97JT606j9Ffx4S2pfIcCo= +github.com/elazarl/goproxy v0.0.0-20241224112848-b717bebf1f4e h1:nOw8FFVWERbrB8rbTTCPr5RbcvzMyG9eM7+7w+EOkhk= +github.com/elazarl/goproxy v0.0.0-20241224112848-b717bebf1f4e/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= @@ -102,8 +102,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=