diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml index f7aa811bc..0eb8cd452 100644 --- a/.github/workflows/build_pipelinesrelease_template.yml +++ b/.github/workflows/build_pipelinesrelease_template.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4.1.0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Configure Agent run: go run mage.go ConfigureAgent - name: Native Build @@ -49,7 +49,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Configure Agent run: go run mage.go ConfigureAgent - name: Cross Compile @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v4.1.0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Configure Agent run: go run mage.go ConfigureAgent - name: Vet @@ -86,7 +86,7 @@ jobs: uses: actions/checkout@v4.1.0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Configure Agent run: go run mage.go ConfigureAgent - name: Unit Test @@ -110,7 +110,7 @@ jobs: uses: actions/checkout@v4.1.0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Download Cross-Compiled Porter Binaries uses: actions/download-artifact@v4.1.0 with: @@ -139,7 +139,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Download Cross-Compiled Porter Binaries uses: actions/download-artifact@v4.1.0 with: @@ -175,7 +175,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: "${{ inputs.GOVERSION }}" + go-version: ${{ inputs.goVersion }} - name: Download Cross-Compiled Porter Binaries uses: actions/download-artifact@v4.1.0 with: diff --git a/build/protoc.Dockerfile b/build/protoc.Dockerfile index 6ad558086..d3b45f1ef 100644 --- a/build/protoc.Dockerfile +++ b/build/protoc.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20 +FROM golang:1.21 RUN apt-get update && apt-get -y install protobuf-compiler RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 diff --git a/go.mod b/go.mod index 2a4b35a20..6d0a6b942 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ replace ( ) require ( - get.porter.sh/magefiles v0.6.6 + get.porter.sh/magefiles v0.6.7 github.com/Masterminds/semver/v3 v3.2.1 github.com/PaesslerAG/jsonpath v0.1.1 github.com/carolynvs/aferox v0.3.0 diff --git a/go.sum b/go.sum index d25190c62..1e8a62333 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -get.porter.sh/magefiles v0.6.6 h1:WGV9U8hvE3q1IhgVU4sbyOhq1sjxhKJbKRQPcltdB20= -get.porter.sh/magefiles v0.6.6/go.mod h1:w37oTKICvvaEKR5KVB9UfN2EX30uYO9Qk0oRoz80DOU= +get.porter.sh/magefiles v0.6.7 h1:/MtnsUs17yRRSZyh6IRX+eP4dc47IRGwUY0aMgUK06Y= +get.porter.sh/magefiles v0.6.7/go.mod h1:w37oTKICvvaEKR5KVB9UfN2EX30uYO9Qk0oRoz80DOU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA=