diff --git a/.circleci/config.yml b/.circleci/config.yml index e5902a2120..335c4deb14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,7 +91,7 @@ jobs: build-linux-alt: working_directory: ~/please docker: - - image: thoughtmachine/please_ubuntu_alt:20240901 + - image: thoughtmachine/please_ubuntu_alt:20240906 resource_class: large environment: PLZ_ARGS: "-p -c cover --profile ci-alt" diff --git a/docs/BUILD b/docs/BUILD index 691281a036..9b692c57cc 100644 --- a/docs/BUILD +++ b/docs/BUILD @@ -59,7 +59,7 @@ genrule( plugins = { "python": "v1.7.3", "java": "v0.4.2", - "go": "v1.21.3", + "go": "v1.21.4", "cc": "v0.4.0", "shell": "v0.2.0", "go-proto": "v0.3.0", diff --git a/plugins/BUILD b/plugins/BUILD index ed50dc7a3a..d3233fe04a 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,7 +1,7 @@ plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.21.4", ) plugin_repo( diff --git a/test/build_defs/test.build_defs b/test/build_defs/test.build_defs index f0c2190688..5830e3f62a 100644 --- a/test/build_defs/test.build_defs +++ b/test/build_defs/test.build_defs @@ -48,6 +48,7 @@ def please_repo_e2e_test( env = { "PLZ_CONFIG_PROFILE": "e2e", "PLZ_OVERRIDES": "remote.URL:", + "GOCOVERDIR": "$TMP_DIR", }, no_test_output = True, labels = labels + ["plz_e2e_test", "e2e"], @@ -107,6 +108,7 @@ def plz_e2e_test(name:str, cmd:str, pre_cmd:str=None, expected_output:str=None, deps = deps, env = { "PLZ_OVERRIDES": "remote.URL:", + "GOCOVERDIR": "$TMP_DIR", }, test_tools = ["//package:installed_files|please"], labels = ['e2e'] + (labels or []), diff --git a/test/entry_point/test_repo/plugins/BUILD_FILE b/test/entry_point/test_repo/plugins/BUILD_FILE index 562e78986c..15efac17df 100644 --- a/test/entry_point/test_repo/plugins/BUILD_FILE +++ b/test/entry_point/test_repo/plugins/BUILD_FILE @@ -7,5 +7,5 @@ plugin_repo( plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.21.3", ) diff --git a/test/plugins/test_repo/plugins/BUILD_FILE b/test/plugins/test_repo/plugins/BUILD_FILE index d0f03b4178..ddff0a9f1a 100644 --- a/test/plugins/test_repo/plugins/BUILD_FILE +++ b/test/plugins/test_repo/plugins/BUILD_FILE @@ -6,5 +6,5 @@ plugin_repo( plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.21.3", ) diff --git a/test/plz_exec/test_repo/plugins/BUILD_FILE b/test/plz_exec/test_repo/plugins/BUILD_FILE index a5e0068095..a7f298e90d 100644 --- a/test/plz_exec/test_repo/plugins/BUILD_FILE +++ b/test/plz_exec/test_repo/plugins/BUILD_FILE @@ -6,5 +6,5 @@ plugin_repo( plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.21.3", ) diff --git a/test/proto_plugin/test_repo/plugins/BUILD_FILE b/test/proto_plugin/test_repo/plugins/BUILD_FILE index c9d9b0fd1d..fa4bc375db 100644 --- a/test/proto_plugin/test_repo/plugins/BUILD_FILE +++ b/test/proto_plugin/test_repo/plugins/BUILD_FILE @@ -6,7 +6,7 @@ plugin_repo( plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.21.3", ) plugin_repo( diff --git a/third_party/go/BUILD b/third_party/go/BUILD index ce86336712..694e0d12f9 100644 --- a/third_party/go/BUILD +++ b/third_party/go/BUILD @@ -5,14 +5,14 @@ package(default_visibility = ["PUBLIC"]) go_toolchain( name = "toolchain", hashes = [ - "ebca81df938d2d1047cc992be6c6c759543cf309d401b86af38a6aed3d4090f4", # darwin-amd64 - "bf8e388b09134164717cd52d3285a4ab3b68691b80515212da0e9f56f518fb1e", # darwin-arm64 - "50f421c7f217083ac94aab1e09400cb9c2fea7d337679ec11f1638a11460da30", # freebsd-amd64 - "f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265", # linux-amd64 - "6a63fef0e050146f275bf02a0896badfe77c11b6f05499bb647e7bd613a45a10", # linux-arm64 + "488d9e4ca3e3ed513ee4edd91bef3a2360c65fa6d6be59cf79640bf840130a58", # go1.23.1.darwin-amd64.tar.gz + "e223795ca340e285a760a6446ce57a74500b30e57469a4109961d36184d3c05a", # go1.23.1.darwin-arm64.tar.gz + "a7d57781c50bb80886a8f04066791956d45aa3eea0f83070c5268b6223afb2ff", # go1.23.1.freebsd-amd64.tar.gz + "49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd", # go1.23.1.linux-amd64.tar.gz + "faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f", # go1.23.1.linux-arm64.tar.gz ], install_std = False, - version = "1.22.0", + version = "1.23.1", ) go_stdlib( diff --git a/tools/images/ubuntu_alt/Dockerfile b/tools/images/ubuntu_alt/Dockerfile index 83eab8db38..c11e006b58 100644 --- a/tools/images/ubuntu_alt/Dockerfile +++ b/tools/images/ubuntu_alt/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && \ apt-get clean # Go -RUN curl -fsSL https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz | tar -xzC /usr/local +RUN curl -fsSL https://dl.google.com/go/go1.22.7.linux-amd64.tar.gz | tar -xzC /usr/local RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt # Locale