From 41cbd3968e1f1adfe6b95b8212a5cc93d017af0a Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 21 Nov 2019 22:18:49 -0500 Subject: [PATCH 1/3] Add compatibility test for v1.1.0 --- .travis.yml | 14 +++++++++++--- README.md | 3 ++- tools/bazel | 4 ++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02ecdd250..a2c77d346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,22 +48,30 @@ jobs: <<: *linux env: TEST_SCRIPT=test_lint # Test + - <<: *linux + env: TEST_SCRIPT=test_rules_scala - <<: *linux env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.0.0 - <<: *linux - env: TEST_SCRIPT=test_rules_scala + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 + - <<: *linux + env: TEST_SCRIPT=test_reproducibility - <<: *linux env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 - <<: *linux - env: TEST_SCRIPT=test_reproducibility + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 - <<: *osx env: TEST_SCRIPT=test_rules_scala - <<: *osx env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.0.0 - <<: *osx - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 - <<: *osx env: TEST_SCRIPT=test_reproducibility + - <<: *osx + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 + - <<: *osx + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 before_install: - | diff --git a/README.md b/README.md index d0612784f..3a3701763 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ This project defines core build rules for [Scala](https://www.scala-lang.org/) t ## Getting started 1. [Install Bazel](https://docs.bazel.build/versions/master/install.html), see the [compatibility table](#bazel-compatible-versions). -2. Add the following to your `WORKSPACE` file and update the `githash` if needed: +2. Add the following to your `WORKSPACE` file and update the `githash` if needed: ```python rules_scala_version="69d3c5b5d9b51537231746e93b4383384c9ebcf4" # update this as needed @@ -108,6 +108,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| +| 1.1.0 | HEAD | | 1.0.0 | HEAD | | 0.28.0 | HEAD | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | diff --git a/tools/bazel b/tools/bazel index 5cafe62fa..501f3ef90 100755 --- a/tools/bazel +++ b/tools/bazel @@ -35,6 +35,10 @@ case "$bazel_version" in darwin_sha='fdab79e3a89e979b63487fd268761aac17a6ca4c8a41830743978c46d2160ff9' linux_sha='f8490463360fff5992b5a5af93f930ff984588765f9ccf3e7dd03db5145fbf0f' ;; + '1.1.0') + darwin_sha='1a552f4ce194860fbbd50eeb319f81788ddf50a849e92378eec72231cc64ef65' + linux_sha='14301099c87568db302d59a5d3585f5eb8a6250ac2c6bb0367c56e623ff6e65f' + ;; *) echo "The requested Bazel version '$bazel_version' is not supported" exit 1 From 95bd52b4dade9bc2fcd047dab8e9fe38a5264c0e Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 21 Nov 2019 22:23:04 -0500 Subject: [PATCH 2/3] Add compatibility test for bazel v1.2.0 --- .travis.yml | 8 ++++++++ README.md | 1 + tools/bazel | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index a2c77d346..8bad399ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,14 @@ jobs: env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 - <<: *osx env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 + - <<: *linux + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 + - <<: *linux + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 + - <<: *osx + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 + - <<: *osx + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 before_install: - | diff --git a/README.md b/README.md index 3a3701763..058c1e783 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| +| 1.2.0 | HEAD | | 1.1.0 | HEAD | | 1.0.0 | HEAD | | 0.28.0 | HEAD | diff --git a/tools/bazel b/tools/bazel index 501f3ef90..cfc3d4dd8 100755 --- a/tools/bazel +++ b/tools/bazel @@ -39,6 +39,10 @@ case "$bazel_version" in darwin_sha='1a552f4ce194860fbbd50eeb319f81788ddf50a849e92378eec72231cc64ef65' linux_sha='14301099c87568db302d59a5d3585f5eb8a6250ac2c6bb0367c56e623ff6e65f' ;; + '1.2.0') + darwin_sha='14da01972d16f43db1962dfc5246bef33e2d619dddeb1ce133ec0c8c18627610' + linux_sha='181b57714200fa5579e12fe3ab4e6f3fd7f6827dff4ec16ff5190302130216af' + ;; *) echo "The requested Bazel version '$bazel_version' is not supported" exit 1 From e80bc50a1f396f1f3566a930ad5ede8924b4e817 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 22 Nov 2019 00:01:28 -0500 Subject: [PATCH 3/3] Remove compatibility test for bazel v1.0.0 and v1.1.0 --- .travis.yml | 16 ---------------- README.md | 2 -- 2 files changed, 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bad399ae..58dc7f33e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,28 +50,12 @@ jobs: # Test - <<: *linux env: TEST_SCRIPT=test_rules_scala - - <<: *linux - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.0.0 - - <<: *linux - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 - <<: *linux env: TEST_SCRIPT=test_reproducibility - - <<: *linux - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 - - <<: *linux - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 - <<: *osx env: TEST_SCRIPT=test_rules_scala - - <<: *osx - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.0.0 - - <<: *osx - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 - <<: *osx env: TEST_SCRIPT=test_reproducibility - - <<: *osx - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.0.0 - - <<: *osx - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 - <<: *linux env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 - <<: *linux diff --git a/README.md b/README.md index 058c1e783..6f52cda49 100644 --- a/README.md +++ b/README.md @@ -109,8 +109,6 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| | 1.2.0 | HEAD | -| 1.1.0 | HEAD | -| 1.0.0 | HEAD | | 0.28.0 | HEAD | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |