From 442aef2b752a9a07b30ba6bc3436d9749be1e2ae Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 22 Nov 2019 18:07:45 -0500 Subject: [PATCH 1/7] Bump v1.1.0 compatibility test to v1.2.0 --- .travis.yml | 8 ++++---- README.md | 2 +- tools/bazel | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fa163ac0..1617ea008 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,19 +51,19 @@ jobs: - <<: *linux env: TEST_SCRIPT=test_rules_scala - <<: *linux - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 - <<: *linux env: TEST_SCRIPT=test_reproducibility - <<: *linux - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 - <<: *osx env: TEST_SCRIPT=test_rules_scala - <<: *osx - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.1.0 + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 - <<: *osx env: TEST_SCRIPT=test_reproducibility - <<: *osx - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.1.0 + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 before_install: - | diff --git a/README.md b/README.md index 6a54ed03a..6f52cda49 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| -| 1.1.0 | HEAD | +| 1.2.0 | HEAD | | 0.28.0 | HEAD | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 | diff --git a/tools/bazel b/tools/bazel index 0874bba50..a4dd3ea5a 100755 --- a/tools/bazel +++ b/tools/bazel @@ -31,9 +31,9 @@ case "$bazel_version" in darwin_sha='5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095' linux_sha='a2a7e4cb38d7bc774a5bbfab4d45293f5f2158eb6caf0128792cc1148732a4e6' ;; - '1.1.0') - 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" From a239d4e25d3073070bbf8d4680ad3dc92f5fac9d Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 22 Nov 2019 18:44:42 -0500 Subject: [PATCH 2/7] Upgrade MacOS from HighSierra to Mojave --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1617ea008..53c19e902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ _linux: &linux os: linux _osx: &osx os: osx - osx_image: xcode10.1 + osx_image: xcode11.2 _windows: os: windows From b73c99cb74b34c60aaf9e8c20bed5efb86ae6d91 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 23 Nov 2019 16:20:10 -0500 Subject: [PATCH 3/7] Empty commit to trigger a new build From 98df24710e28921cbdec4c716edf0fc1958839c1 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 26 Nov 2019 12:14:26 -0500 Subject: [PATCH 4/7] Bump bazel to v1.2.1 --- .travis.yml | 8 ++++---- README.md | 2 +- tools/bazel | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53c19e902..56fef39b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,19 +51,19 @@ jobs: - <<: *linux env: TEST_SCRIPT=test_rules_scala - <<: *linux - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.1 - <<: *linux env: TEST_SCRIPT=test_reproducibility - <<: *linux - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.1 - <<: *osx env: TEST_SCRIPT=test_rules_scala - <<: *osx - env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.0 + env: TEST_SCRIPT=test_rules_scala BAZEL_VERSION=1.2.1 - <<: *osx env: TEST_SCRIPT=test_reproducibility - <<: *osx - env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.0 + env: TEST_SCRIPT=test_reproducibility BAZEL_VERSION=1.2.1 before_install: - | diff --git a/README.md b/README.md index 6f52cda49..058115a12 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| -| 1.2.0 | HEAD | +| 1.2.1 | HEAD | | 0.28.0 | HEAD | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 | diff --git a/tools/bazel b/tools/bazel index a4dd3ea5a..ba2be792c 100755 --- a/tools/bazel +++ b/tools/bazel @@ -31,9 +31,9 @@ case "$bazel_version" in darwin_sha='5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095' linux_sha='a2a7e4cb38d7bc774a5bbfab4d45293f5f2158eb6caf0128792cc1148732a4e6' ;; - '1.2.0') - darwin_sha='14da01972d16f43db1962dfc5246bef33e2d619dddeb1ce133ec0c8c18627610' - linux_sha='181b57714200fa5579e12fe3ab4e6f3fd7f6827dff4ec16ff5190302130216af' + '1.2.1') + darwin_sha='59e469bf1d8d1615b67856ea17e761be05e9c92b462e55c0354cd78145b480d5' + linux_sha='ae6249e25b0f5a06d79fad90325477dd56275657951cf7aa6a3cbcd79fc4d749' ;; *) echo "The requested Bazel version '$bazel_version' is not supported" From 55ba080805e5a4e0233dcb3c8301a269618c8b8a Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 26 Nov 2019 13:05:47 -0500 Subject: [PATCH 5/7] Fix sha for 0.28.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 058115a12..8346f6fa1 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| | 1.2.1 | HEAD | -| 0.28.0 | HEAD | +| 0.28.0 | ff41ec67cec20772c46beca784f6dfe2f6204181 | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 | | 0.16.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 | From 2b17f1ec7cb037ec1fb7b783a99c3c78d42ffd69 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 26 Nov 2019 23:08:23 -0500 Subject: [PATCH 6/7] Revert "Upgrade MacOS from HighSierra to Mojave" This reverts commit a239d4e25d3073070bbf8d4680ad3dc92f5fac9d. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56fef39b3..c32131978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ _linux: &linux os: linux _osx: &osx os: osx - osx_image: xcode11.2 + osx_image: xcode10.1 _windows: os: windows From 1114752c34292af4588d0549b56eedd342da0992 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 26 Nov 2019 23:08:50 -0500 Subject: [PATCH 7/7] Update sha for 0.28.0 to HEAD --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8346f6fa1..058115a12 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ for an example workspace using another scala version. | bazel | rules_scala gitsha | |--------|--------------------| | 1.2.1 | HEAD | -| 0.28.0 | ff41ec67cec20772c46beca784f6dfe2f6204181 | +| 0.28.0 | HEAD | | 0.23.x | ca655e5a330cbf1d66ce1d9baa63522752ec6011 | | | 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 | | 0.16.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |