Skip to content

Commit

Permalink
Update golang to 1.22.4 (#4164)
Browse files Browse the repository at this point in the history
* Update golang to 1.22.4

Signed-off-by: Louis Jimenez <louisjimenez@google.com>

* Replace busybox with no-op function in test

Signed-off-by: Fredrik Sommar <fred.sommar+github@gmail.com>

---------

Signed-off-by: Louis Jimenez <louisjimenez@google.com>
Signed-off-by: Fredrik Sommar <fred.sommar+github@gmail.com>
Co-authored-by: Fredrik Sommar <fred.sommar+github@gmail.com>
  • Loading branch information
louisjimenez and fsommar authored Jun 28, 2024
1 parent 9566954 commit 1d13188
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checkLicenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
- run: |
./scripts/create-licenses.sh
# Upload the licenses list so it's available if needed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2eEnvironment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
- uses: actions/checkout@v3
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
# If you upgrade this version confirm the changes match your expectations
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
Expand All @@ -88,7 +88,7 @@ jobs:
# - name: Set up Go
# uses: actions/setup-go@v1
# with:
# go-version: '>=1.21.10'
# go-version: '>=1.22.4'
# id: go
# - name: Check out code into the Go module directory
# uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/live-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
- uses: actions/checkout@master
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
# If you upgrade this version confirm the changes match your expectations
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
- name: Checkout
uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verifyContent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '>=1.21.10'
go-version: '>=1.22.4'
- uses: actions/checkout@v3
- run: |
make build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

GOLANG_VERSION := 1.21.10
GOLANG_VERSION := 1.22.4
GORELEASER_CONFIG = release/tag/goreleaser.yaml
GORELEASER_IMAGE := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)

Expand Down
5 changes: 3 additions & 2 deletions internal/fnruntime/container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ func TestContainerFn(t *testing.T) {
err bool
}{
{
name: "simple busybox",
image: "gcr.io/google-containers/busybox",
name: "no-op function",
image: "gcr.io/kpt-functions/no-op",
output: "apiVersion: v1\nkind: ResourceList\nmetadata:\n name: output\nitems: []\n",
},
{
name: "non-existing image",
Expand Down

0 comments on commit 1d13188

Please sign in to comment.