diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index d68f3c788..4c928ff50 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -51,17 +51,42 @@ tasks: - "//test/..." test_targets: - "//test/..." + test_rules_scala_linux: + name: "./test_rules_scala" + platform: ubuntu1804 + shell_commands: + - "./test_rules_scala.sh" + test_rules_scala_macos: + name: "./test_rules_scala" + platform: macos + shell_commands: + - "./test_rules_scala.sh" + test_reproducibility_linux: + name: "./test_reproducibility.sh" + platform: ubuntu1804 + shell_commands: + - "./test_reproducibility.sh" + test_reproducibility_macos: + name: "./test_reproducibility.sh" + platform: macos + shell_commands: + - "./test_reproducibility.sh" versions_ubuntu2004: name: "./test_version.sh" platform: ubuntu2004 shell_commands: - - ./test_version.sh + - "./test_version.sh" versions_macos: name: "./test_version.sh" platform: macos shell_commands: - - ./test_version.sh + - "./test_version.sh" examples_ubuntu2004: + name: "./test_examples" + platform: ubuntu2004 + shell_commands: + - "./test_examples.sh" + lint_ubuntu2004: name: "bazel //tools:lint_check" platform: ubuntu2004 run_targets: diff --git a/.bazelrc.travis b/.bazelrc.travis deleted file mode 100644 index ab2bd9aba..000000000 --- a/.bazelrc.travis +++ /dev/null @@ -1,25 +0,0 @@ -# This is from Bazel's former travis setup, to avoid blowing up the RAM usage. -startup --host_jvm_args=-Xmx3072m -startup --host_jvm_args=-Xms1024m -# startup --batch # we actually start many bazels in the test script, we don't want batch - -# Just making sure that we don't OOM with parallel builds -build --local_ram_resources=3072 --local_cpu_resources="HOST_CPUS*.5" - -# This is so we understand failures better -build --verbose_failures - -# This is so we use a recent enough GCC when building. -# build --crosstool_top //tools/custom_crosstool:CROSSTOOL - -# This is so we don't use sandboxed execution. Sandboxed execution -# runs stuff in a container, and since Travis already runs its script -# in a container (unless you require sudo in your .travis.yml) this -# fails to run tests. -build --strategy=Scalac=worker --strategy=ScroogeRule=worker --worker_max_instances=2 -#test --test_strategy=standalone - -# Below this line, .travis.yml will cat the default bazelrc. -# This is needed so Bazel starts with the base workspace in its -# package path. -build --disk_cache=.bazel_cache diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f2f815a81..000000000 --- a/.travis.yml +++ /dev/null @@ -1,90 +0,0 @@ -dist: xenial -sudo: required -language: sh - -addons: - apt: - packages: - - libxml2-utils - -cache: - directories: - - .bazel_cache - - ~/xdg_cache - -_linux: &linux - os: linux -_osx: &osx - os: osx - osx_image: xcode10.1 -_windows: - os: windows - -### -# -# Want to update/change bazel versions? -# -# -# either -# - If you're updating the default bazel version, change -# default_bazel_version in .bazelversion -# or -# - If you want to add an additional bazel version to -# the build matrix, add below another job -#. with variable USE_BAZEL_VERSION= -# -# -### - -jobs: - include: -# Lint - - name: "Lint" - <<: *linux - env: TEST_SCRIPT=test_lint XDG_CACHE_HOME=~/xdg_cache -# Test - - name: "[linux] Test rules_scala" - <<: *linux - env: TEST_SCRIPT=test_rules_scala XDG_CACHE_HOME=~/xdg_cache - - name: "[linux] Test reproducibility" - <<: *linux - env: TEST_SCRIPT=test_reproducibility XDG_CACHE_HOME=~/xdg_cache - - name: "[osx] Test rules_scala" - <<: *osx - env: TEST_SCRIPT=test_rules_scala XDG_CACHE_HOME=~/xdg_cache - - name: "[osx] Test reproducibility" - <<: *osx - env: TEST_SCRIPT=test_reproducibility XDG_CACHE_HOME=~/xdg_cache - - name: "[linux] Dry test rules_scala + latest bazel version" - <<: *linux - env: TEST_SCRIPT=test_rules_scala XDG_CACHE_HOME=~/xdg_cache USE_BAZEL_VERSION=latest - - allow_failures: - env: TEST_SCRIPT=test_rules_scala XDG_CACHE_HOME=~/xdg_cache USE_BAZEL_VERSION=latest - -before_install: - - | - if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then - choco install jdk8 -params 'installdir=c:\\java8' - mkdir %USERPROFILE%\bazel - powershell Invoke-WebRequest https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-windows-amd64.exe -OutFile %USERPROFILE%\bazel\bazel.exe - fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then - sudo wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64 - sudo chmod +x /usr/local/bin/bazel - fi - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - sudo wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-darwin-amd64 - sudo chmod +x /usr/local/bin/bazel - fi - cat .bazelrc.travis >> .bazelrc - -script: - - | - if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then - powershell -Command 'Set-ExecutionPolicy RemoteSigned -scope CurrentUser' - export JAVA_HOME='c:\\\\java8' - export PATH=%PATH%;%USERPROFILE%\bazel - fi - bazel --version - bash ./${TEST_SCRIPT}.sh ci diff --git a/README.md b/README.md index b3ed9596c..662a6ef0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Scala Rules for Bazel -[![Build Status](https://travis-ci.org/bazelbuild/rules_scala.svg?branch=master)](https://travis-ci.org/bazelbuild/rules_scala) [![Build status](https://badge.buildkite.com/90ce5244556df74db805a3c24a703fb87458396f9e1ddd687e.svg?branch=master)](https://buildkite.com/bazel/scala-rules-scala-postsubmit) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/bazelbuild_rules_scala/Lobby) +[![Build status](https://badge.buildkite.com/90ce5244556df74db805a3c24a703fb87458396f9e1ddd687e.svg?branch=master)](https://buildkite.com/bazel/scala-rules-scala-postsubmit) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/bazelbuild_rules_scala/Lobby) ## Overview