From 6dd8ef83575a33f034765809f02da691f0b2b87d Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 14:08:00 +0100 Subject: [PATCH 01/12] Forgot to commit this --- .circleci/config.yml | 2 +- tools/images/ubuntu_alt/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 From 59dfb2ae408a092302f355419b73243e7b391893 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 14:26:32 +0100 Subject: [PATCH 02/12] Update toolchain to Go 1.23.1 --- third_party/go/BUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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( From f24a0a292c5b4d30ac1ab880411815abc2a274d9 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 14:56:43 +0100 Subject: [PATCH 03/12] Update plugin --- plugins/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/BUILD b/plugins/BUILD index ed50dc7a3a..84678ec4e6 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,7 +1,7 @@ plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.20.1", + revision = "v1.23.1", ) plugin_repo( From ac56de3098372ca8e6c7d3f45f726fd7b0cdaa3e Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 15:00:37 +0100 Subject: [PATCH 04/12] these too --- test/entry_point/test_repo/plugins/BUILD_FILE | 2 +- test/plugins/test_repo/plugins/BUILD_FILE | 2 +- test/plz_exec/test_repo/plugins/BUILD_FILE | 2 +- test/proto_plugin/test_repo/plugins/BUILD_FILE | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/entry_point/test_repo/plugins/BUILD_FILE b/test/entry_point/test_repo/plugins/BUILD_FILE index 562e78986c..609ff185d8 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.23.1", ) diff --git a/test/plugins/test_repo/plugins/BUILD_FILE b/test/plugins/test_repo/plugins/BUILD_FILE index d0f03b4178..26c0e0904f 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.23.1", ) diff --git a/test/plz_exec/test_repo/plugins/BUILD_FILE b/test/plz_exec/test_repo/plugins/BUILD_FILE index a5e0068095..05a55cd660 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.23.1", ) diff --git a/test/proto_plugin/test_repo/plugins/BUILD_FILE b/test/proto_plugin/test_repo/plugins/BUILD_FILE index c9d9b0fd1d..ba83a754c6 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.23.1", ) plugin_repo( From a89eaea85dd4982b5f7be9f0e2853612f807dab3 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 15:03:07 +0100 Subject: [PATCH 05/12] apparently I can't do numbers --- plugins/BUILD | 2 +- test/entry_point/test_repo/plugins/BUILD_FILE | 2 +- test/plugins/test_repo/plugins/BUILD_FILE | 2 +- test/plz_exec/test_repo/plugins/BUILD_FILE | 2 +- test/proto_plugin/test_repo/plugins/BUILD_FILE | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/BUILD b/plugins/BUILD index 84678ec4e6..3d28e415d9 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,7 +1,7 @@ plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.23.1", + revision = "v1.21.3", ) plugin_repo( diff --git a/test/entry_point/test_repo/plugins/BUILD_FILE b/test/entry_point/test_repo/plugins/BUILD_FILE index 609ff185d8..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.23.1", + revision = "v1.21.3", ) diff --git a/test/plugins/test_repo/plugins/BUILD_FILE b/test/plugins/test_repo/plugins/BUILD_FILE index 26c0e0904f..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.23.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 05a55cd660..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.23.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 ba83a754c6..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.23.1", + revision = "v1.21.3", ) plugin_repo( From 5df97a5fe9d6022987a38bec37c8f151e665bcfe Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 15:26:14 +0100 Subject: [PATCH 06/12] Fix everything --- src/test/coverage_test.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/test/coverage_test.go b/src/test/coverage_test.go index ad64fddf5a..d9cb444f97 100644 --- a/src/test/coverage_test.go +++ b/src/test/coverage_test.go @@ -12,10 +12,11 @@ import ( var target = &core.BuildTarget{Label: core.BuildLabel{PackageName: "src/test", Name: "coverage_test"}} const ( - pythonCoverageFile = "src/test/test_data/python-coverage.xml" - goCoverageFile = "src/test/test_data/go_coverage.txt" - goCoverageFile2 = "src/test/test_data/go_coverage_2.txt" - goCoverageFile3 = "src/test/test_data/go_coverage_3.txt" + pythonCoverageFile = "src/test/test_data/python-coverage.xml" + // TODO(peterebden): Remove the 'x' on these once we update go-rules again + xgoCoverageFile = "src/test/test_data/go_coverage.txt" + xgoCoverageFile2 = "src/test/test_data/go_coverage_2.txt" + xgoCoverageFile3 = "src/test/test_data/go_coverage_3.txt" gcovCoverageFile = "src/test/test_data/gcov_coverage.gcov" istanbulCoverageFile = "src/test/test_data/istanbul_coverage.json" istanbulCoverageFile2 = "src/test/test_data/istanbul_coverage_2.json" @@ -68,9 +69,9 @@ func TestPythonResults(t *testing.T) { // Test the sample Go test output file. func TestGoResults(t *testing.T) { - coverage, err := parseTestCoverageFile(target, goCoverageFile, 1) + coverage, err := parseTestCoverageFile(target, xgoCoverageFile, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", goCoverageFile) + t.Errorf("Failed to read coverage file %s", xgoCoverageFile) } if len(coverage.Files) != 7 { t.Errorf("Expected exactly seven files covered by this test") @@ -94,9 +95,9 @@ func TestGoResults(t *testing.T) { // Test another sample Go file which has been observed to be wrong. func TestGoResults2(t *testing.T) { - coverage, err := parseTestCoverageFile(target, goCoverageFile2, 1) + coverage, err := parseTestCoverageFile(target, xgoCoverageFile2, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", goCoverageFile2) + t.Errorf("Failed to read coverage file %s", xgoCoverageFile2) } if len(coverage.Files) != 1 { t.Errorf("Expected exactly one file covered by this test") @@ -122,9 +123,9 @@ func TestGoResults2(t *testing.T) { } func TestGoResults3(t *testing.T) { - coverage, err := parseTestCoverageFile(target, goCoverageFile3, 1) + coverage, err := parseTestCoverageFile(target, xgoCoverageFile3, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", goCoverageFile3) + t.Errorf("Failed to read coverage file %s", xgoCoverageFile3) } if len(coverage.Files) != 1 { t.Errorf("Expected exactly one file covered by this test") From 54b597a9f309c0e322d3028d7e0d31ab02d78b97 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 6 Sep 2024 16:14:38 +0100 Subject: [PATCH 07/12] Chuck this in here, goodness knows why --- src/update/update_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/update/update_test.go b/src/update/update_test.go index 098e0399da..34c163dfd8 100644 --- a/src/update/update_test.go +++ b/src/update/update_test.go @@ -30,6 +30,7 @@ func (*fakeLogBackend) Log(level logging.Level, calldepth int, rec *logging.Reco } func TestVerifyNewPlease(t *testing.T) { + t.Setenv("GOCOVERDIR", os.Getenv("TEST_DIR")) assert.True(t, verifyNewPlease("src/please", core.PleaseVersion)) assert.False(t, verifyNewPlease("src/please", "wibble")) assert.False(t, verifyNewPlease("wibble", core.PleaseVersion)) From 23bbbc6fd60c19b46fcfe0b3fbe0f84dc95053d5 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Mon, 9 Sep 2024 10:34:12 +0100 Subject: [PATCH 08/12] Bump to newer rev --- plugins/BUILD | 3 ++- src/update/update_test.go | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/BUILD b/plugins/BUILD index 3d28e415d9..bca45109f7 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,7 +1,8 @@ plugin_repo( name = "go", plugin = "go-rules", - revision = "v1.21.3", + revision = "02f5910e44bb8274b5bdb80ec80188a9d180f59f", + owner = "peterebden", ) plugin_repo( diff --git a/src/update/update_test.go b/src/update/update_test.go index 34c163dfd8..098e0399da 100644 --- a/src/update/update_test.go +++ b/src/update/update_test.go @@ -30,7 +30,6 @@ func (*fakeLogBackend) Log(level logging.Level, calldepth int, rec *logging.Reco } func TestVerifyNewPlease(t *testing.T) { - t.Setenv("GOCOVERDIR", os.Getenv("TEST_DIR")) assert.True(t, verifyNewPlease("src/please", core.PleaseVersion)) assert.False(t, verifyNewPlease("src/please", "wibble")) assert.False(t, verifyNewPlease("wibble", core.PleaseVersion)) From c7d28a3180f240dde12ab1e8fd9a4d9279acb267 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Mon, 9 Sep 2024 10:46:09 +0100 Subject: [PATCH 09/12] set env vars here too --- test/build_defs/test.build_defs | 2 ++ 1 file changed, 2 insertions(+) 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 []), From c90911930cd03473cb10e051e78ea681676176f6 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Mon, 9 Sep 2024 12:05:07 +0100 Subject: [PATCH 10/12] Use official version --- plugins/BUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/BUILD b/plugins/BUILD index bca45109f7..d3233fe04a 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -1,8 +1,7 @@ plugin_repo( name = "go", plugin = "go-rules", - revision = "02f5910e44bb8274b5bdb80ec80188a9d180f59f", - owner = "peterebden", + revision = "v1.21.4", ) plugin_repo( From ccdcd13682193f2351aa29034fa5e84c1e9ce773 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Mon, 9 Sep 2024 14:23:06 +0100 Subject: [PATCH 11/12] of course --- docs/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 703c2824afc6ac8592bebf006506bee25495629d Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Mon, 9 Sep 2024 15:45:58 +0100 Subject: [PATCH 12/12] Revert test change --- src/test/coverage_test.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/test/coverage_test.go b/src/test/coverage_test.go index d9cb444f97..ad64fddf5a 100644 --- a/src/test/coverage_test.go +++ b/src/test/coverage_test.go @@ -12,11 +12,10 @@ import ( var target = &core.BuildTarget{Label: core.BuildLabel{PackageName: "src/test", Name: "coverage_test"}} const ( - pythonCoverageFile = "src/test/test_data/python-coverage.xml" - // TODO(peterebden): Remove the 'x' on these once we update go-rules again - xgoCoverageFile = "src/test/test_data/go_coverage.txt" - xgoCoverageFile2 = "src/test/test_data/go_coverage_2.txt" - xgoCoverageFile3 = "src/test/test_data/go_coverage_3.txt" + pythonCoverageFile = "src/test/test_data/python-coverage.xml" + goCoverageFile = "src/test/test_data/go_coverage.txt" + goCoverageFile2 = "src/test/test_data/go_coverage_2.txt" + goCoverageFile3 = "src/test/test_data/go_coverage_3.txt" gcovCoverageFile = "src/test/test_data/gcov_coverage.gcov" istanbulCoverageFile = "src/test/test_data/istanbul_coverage.json" istanbulCoverageFile2 = "src/test/test_data/istanbul_coverage_2.json" @@ -69,9 +68,9 @@ func TestPythonResults(t *testing.T) { // Test the sample Go test output file. func TestGoResults(t *testing.T) { - coverage, err := parseTestCoverageFile(target, xgoCoverageFile, 1) + coverage, err := parseTestCoverageFile(target, goCoverageFile, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", xgoCoverageFile) + t.Errorf("Failed to read coverage file %s", goCoverageFile) } if len(coverage.Files) != 7 { t.Errorf("Expected exactly seven files covered by this test") @@ -95,9 +94,9 @@ func TestGoResults(t *testing.T) { // Test another sample Go file which has been observed to be wrong. func TestGoResults2(t *testing.T) { - coverage, err := parseTestCoverageFile(target, xgoCoverageFile2, 1) + coverage, err := parseTestCoverageFile(target, goCoverageFile2, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", xgoCoverageFile2) + t.Errorf("Failed to read coverage file %s", goCoverageFile2) } if len(coverage.Files) != 1 { t.Errorf("Expected exactly one file covered by this test") @@ -123,9 +122,9 @@ func TestGoResults2(t *testing.T) { } func TestGoResults3(t *testing.T) { - coverage, err := parseTestCoverageFile(target, xgoCoverageFile3, 1) + coverage, err := parseTestCoverageFile(target, goCoverageFile3, 1) if err != nil { - t.Errorf("Failed to read coverage file %s", xgoCoverageFile3) + t.Errorf("Failed to read coverage file %s", goCoverageFile3) } if len(coverage.Files) != 1 { t.Errorf("Expected exactly one file covered by this test")