From f48619a6a6914c70c7d9e46cda0cdc79505ba8fe Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Thu, 10 Feb 2022 21:48:24 -0800 Subject: [PATCH 1/5] Depends on https://github.com/pantsbuild/pants/pull/14421 --- tests/jvm/org/pantsbuild/example/lib/BUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/jvm/org/pantsbuild/example/lib/BUILD b/tests/jvm/org/pantsbuild/example/lib/BUILD index 06359c1..d5dde0a 100644 --- a/tests/jvm/org/pantsbuild/example/lib/BUILD +++ b/tests/jvm/org/pantsbuild/example/lib/BUILD @@ -1 +1,3 @@ -scalatest_tests() +scalatest_tests( + jdk=parametrize(adopt_11="adopt:1.11", adopt_12="adopt:1.12.0.2"), +) From 90caae6405f7983b067c7b79373f4218ec35726a Mon Sep 17 00:00:00 2001 From: Tom Dyas Date: Wed, 16 Feb 2022 09:04:10 -0500 Subject: [PATCH 2/5] pin Pants version and avoid parametrize for now --- pants | 1 + tests/jvm/org/pantsbuild/example/lib/BUILD | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pants b/pants index f5b2b80..ae4c5af 100755 --- a/pants +++ b/pants @@ -16,6 +16,7 @@ set -eou pipefail # locate the main branch SHA, set PANTS_SHA= in the environment, and run this script as usual. # # E.g., PANTS_SHA=725fdaf504237190f6787dda3d72c39010a4c574 ./pants --version +PANTS_SHA=0c28019796250b5dac84891a14c1cf006183c08c PYTHON_BIN_NAME="${PYTHON:-unspecified}" diff --git a/tests/jvm/org/pantsbuild/example/lib/BUILD b/tests/jvm/org/pantsbuild/example/lib/BUILD index d5dde0a..0ce1043 100644 --- a/tests/jvm/org/pantsbuild/example/lib/BUILD +++ b/tests/jvm/org/pantsbuild/example/lib/BUILD @@ -1,3 +1,8 @@ scalatest_tests( - jdk=parametrize(adopt_11="adopt:1.11", adopt_12="adopt:1.12.0.2"), + jdk="adopt:1.11", +) + +scalatest_tests( + name="tests_adop_1.12", + jdk="adopt:1.12.0.2", ) From 961caf0a966014a77fd3ed93315e74106edb9cdd Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Wed, 16 Feb 2022 14:25:38 -0800 Subject: [PATCH 3/5] Bump to `79fe06e3ce4f16e45e04f59ca61de9fe19e4e216` and reintroduce `parametrize`. --- pants | 4 +++- tests/jvm/org/pantsbuild/example/lib/BUILD | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pants b/pants index ae4c5af..0115a6c 100755 --- a/pants +++ b/pants @@ -16,7 +16,9 @@ set -eou pipefail # locate the main branch SHA, set PANTS_SHA= in the environment, and run this script as usual. # # E.g., PANTS_SHA=725fdaf504237190f6787dda3d72c39010a4c574 ./pants --version -PANTS_SHA=0c28019796250b5dac84891a14c1cf006183c08c + +# TODO: Picks up https://github.com/pantsbuild/pants/pull/14510. +PANTS_SHA=79fe06e3ce4f16e45e04f59ca61de9fe19e4e216 PYTHON_BIN_NAME="${PYTHON:-unspecified}" diff --git a/tests/jvm/org/pantsbuild/example/lib/BUILD b/tests/jvm/org/pantsbuild/example/lib/BUILD index 0ce1043..d5dde0a 100644 --- a/tests/jvm/org/pantsbuild/example/lib/BUILD +++ b/tests/jvm/org/pantsbuild/example/lib/BUILD @@ -1,8 +1,3 @@ scalatest_tests( - jdk="adopt:1.11", -) - -scalatest_tests( - name="tests_adop_1.12", - jdk="adopt:1.12.0.2", + jdk=parametrize(adopt_11="adopt:1.11", adopt_12="adopt:1.12.0.2"), ) From 17c58063778a72f4fc1e9e6ec3547dd4ba07cc99 Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Wed, 23 Mar 2022 11:06:07 -0700 Subject: [PATCH 4/5] Use `parametrize` from 2.11.0.dev3 directly. --- pants | 3 --- 1 file changed, 3 deletions(-) diff --git a/pants b/pants index 0115a6c..f5b2b80 100755 --- a/pants +++ b/pants @@ -17,9 +17,6 @@ set -eou pipefail # # E.g., PANTS_SHA=725fdaf504237190f6787dda3d72c39010a4c574 ./pants --version -# TODO: Picks up https://github.com/pantsbuild/pants/pull/14510. -PANTS_SHA=79fe06e3ce4f16e45e04f59ca61de9fe19e4e216 - PYTHON_BIN_NAME="${PYTHON:-unspecified}" # Set this to specify a non-standard location for this script to read the Pants version from. From 52459008a096cfcd5284ccc88b9d50c4d4bdadcc Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Wed, 20 Apr 2022 11:03:11 -0700 Subject: [PATCH 5/5] Comment. --- tests/jvm/org/pantsbuild/example/lib/BUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/jvm/org/pantsbuild/example/lib/BUILD b/tests/jvm/org/pantsbuild/example/lib/BUILD index d5dde0a..833c28e 100644 --- a/tests/jvm/org/pantsbuild/example/lib/BUILD +++ b/tests/jvm/org/pantsbuild/example/lib/BUILD @@ -1,3 +1,5 @@ scalatest_tests( + # These tests are `parametrize`d, so that they will run against two different + # JDK versions. jdk=parametrize(adopt_11="adopt:1.11", adopt_12="adopt:1.12.0.2"), )