From 80725b89ea2dfb94148acf115c33e2bb1144f741 Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Thu, 27 Jan 2022 17:01:15 +0100
Subject: [PATCH] CI: test on JDK 8 and 11 (#757)

---
 .github/workflows/ci.yml | 11 +++++------
 .travis.yml              | 32 --------------------------------
 README.md                | 16 ++++++++--------
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1cbe5bf2d..e2676c669 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,15 +4,14 @@ on:
   push:
 jobs:
   test:
+    runs-on: ubuntu-latest
+    if: github.repository == 'lightbend/config'
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            java: 8
-          - os: windows-latest
-            java: 17
-    runs-on: ${{ matrix.os }}
+          - java: 8
+          - java: 11
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -23,4 +22,4 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Build and test
         shell: bash
-        run: sbt -v +test +doc
+        run: sbt -v test doc
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 980ed49e4..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# use Docker-based container (instead of OpenVZ)
-sudo: false
-
-language: scala
-
-before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
-install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version
-
-jobs:
-  include:
-     - stage: jdk8
-       name: "test and docs on jdk8"
-       script: sbt ++$TRAVIS_SCALA_VERSION test doc
-     - stage: jdk11
-       name: "test and docs on jdk11"
-       script: sbt ++$TRAVIS_SCALA_VERSION test doc
-       env: TRAVIS_JDK=11
-
-env:
-  global:
-    - TRAVIS_JDK=8
-
-before_cache:
-  # Remove to avoid unnecessary cache updates
-  - find $HOME/.sbt -name "*.lock" -delete
-  - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
-
-cache:
-  directories:
-    - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot
-    - $HOME/.jabba/jdk
diff --git a/README.md b/README.md
index 17b49f802..399114c2f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Configuration library for JVM languages.
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config)
-[![Build Status](https://travis-ci.org/lightbend/config.svg?branch=master)](https://travis-ci.org/lightbend/config)
+[![Build Status](https://github.com/lightbend/config/actions/workflows/ci.yml/badge.svg)](https://github.com/lightbend/config/actions/workflows/ci.yml)
 
 If you have questions or are working on a pull request or just
 curious, please feel welcome to join the chat room:
@@ -120,7 +120,7 @@ Link for direct download if you don't use a dependency manager:
 ### Release Notes
 
 Please see NEWS.md in this directory,
-https://github.com/lightbend/config/blob/master/NEWS.md
+https://github.com/lightbend/config/blob/main/NEWS.md
 
 ### API docs
 
@@ -128,7 +128,7 @@ https://github.com/lightbend/config/blob/master/NEWS.md
  - also published in jar form
  - consider reading this README first for an intro
  - for questions about the `.conf` file format, read
-   [HOCON.md](https://github.com/lightbend/config/blob/master/HOCON.md)
+   [HOCON.md](https://github.com/lightbend/config/blob/main/HOCON.md)
    in this directory
 
 ### Bugs and Patches
@@ -142,7 +142,7 @@ account - it takes 30 seconds.  You can do this at
 https://www.lightbend.com/contribute/cla
 
 Please see
-[CONTRIBUTING](https://github.com/lightbend/config/blob/master/CONTRIBUTING.md)
+[CONTRIBUTING](https://github.com/lightbend/config/blob/main/CONTRIBUTING.md)
 for more including how to make a release.
 
 ### Build
@@ -163,7 +163,7 @@ Scala dependency.
 
 ### Longer Examples
 
-See the examples in the `examples/` [directory](https://github.com/lightbend/config/tree/master/examples).
+See the examples in the `examples/` [directory](https://github.com/lightbend/config/tree/main/examples).
 
 You can run these from the sbt console with the commands `project
 config-simple-app-java` and then `run`.
@@ -436,7 +436,7 @@ this:
 Using the `Config` interface, you could write
 `conf.getInt("foo.bar")`. The `foo.bar` string is called a _path
 expression_
-([HOCON.md](https://github.com/lightbend/config/blob/master/HOCON.md)
+([HOCON.md](https://github.com/lightbend/config/blob/main/HOCON.md)
 has the syntax details for these expressions). Iterating over this
 `Config`, you would get two entries; `"foo.bar" : 42` and
 `"foo.baz" : 43`. When iterating a `Config` you will not find
@@ -492,7 +492,7 @@ particular value manually).
 
 The JSON superset is called "Human-Optimized Config Object
 Notation" or HOCON, and files use the suffix `.conf`.  See
-[HOCON.md](https://github.com/lightbend/config/blob/master/HOCON.md)
+[HOCON.md](https://github.com/lightbend/config/blob/main/HOCON.md)
 in this directory for more detail.
 
 After processing a `.conf` file, the result is always just a JSON
@@ -803,7 +803,7 @@ have expressed interest in a branch off of 1.3.x supporting
 Java 7. If you want to work on that branch you might bring it up
 on [chat](https://gitter.im/lightbend/config). We can release a
 jar for Java 7 if someone(s) steps up to maintain the branch. The
-master branch does not use Java 8 "gratuitously" but some APIs
+main branch does not use Java 8 "gratuitously" but some APIs
 that use Java 8 types will need to be removed.
 
 ### Rationale for Supported File Formats