From 595f8142e0e6a8a1fbb0d0179996f16bfcf42016 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Tue, 1 Sep 2020 13:09:09 -0400
Subject: [PATCH] Now that the Travis build is working I'm reverting back to
 the original format.

---
 .travis.yml | 152 +++++++++++++++++++++++-----------------------------
 1 file changed, 67 insertions(+), 85 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbe3b07c29..534ba30367 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,85 +1,67 @@
-{
-  "language": "java",
-  "os": [
-    "linux"
-  ],
-  "dist": "bionic",
-  "jobs": {
-    "include": [
-      {
-        "os": "linux",
-        "dist": "bionic"
-      },
-      {
-        "os": "osx"
-      }
-    ]
-  },
-  "env": {
-    "global": [
-      {
-        "TSK_HOME": "$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit"
-      }
-    ]
-  },
-  "addons": {
-    "apt": {
-      "update": true,
-      "packages": [
-        "testdisk",
-        "libafflib-dev",
-        "libewf-dev",
-        "libpq-dev",
-        "autopoint",
-        "libsqlite3-dev",
-        "ant",
-        "ant-optional",
-        "libcppunit-dev",
-        "wget"
-      ]
-    },
-    "homebrew": {
-      "update": true,
-      "packages": [
-        "ant",
-        "wget",
-        "libpq",
-        "libewf",
-        "gettext",
-        "cppunit",
-        "afflib",
-        "testdisk"
-      ]
-    }
-  },
-  "python": [
-    "2.7"
-  ],
-  "before_install": [
-    "git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit",
-    "python setupSleuthkitBranch.py"
-  ],
-  "install": [
-    "pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd"
-  ],
-  "before_script": [
-    "if [ $TRAVIS_OS_NAME = linux ]; then 
-	wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -;
-	echo \"deb [arch=amd64] https://apt.bell-sw.com/ stable main\" | sudo tee /etc/apt/sources.list.d/bellsoft.list; 
-	sudo apt-get update;
-	sudo apt-get install bellsoft-java11-full;
-	export PATH=/usr/bin:$PATH;
-	export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64; 
-    fi",
-    "if [ $TRAVIS_OS_NAME = osx ]; then 
-	brew uninstall java --force --ignore-dependencies; 
-	brew cask uninstall java --force; 
-	brew tap bell-sw/liberica; 
-	brew cask install liberica-jdk11-full; 
-	export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11-full.jdk/Contents/Home;
-	/usr/libexec/java_home -V;
-    fi",
-    "java -version"
-  ],
-  "script": ./travis_build.sh
-}
\ No newline at end of file
+language: java
+
+jobs:
+  include:
+    - os: linux
+      dist: bionic
+    - os: osx
+
+env:
+  global:
+    - TSK_HOME=$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit
+
+addons:
+  apt:
+    update: true
+    packages:
+      - testdisk
+      - libafflib-dev
+      - libewf-dev
+      - libpq-dev
+      - autopoint
+      - libsqlite3-dev
+      - ant
+      - ant-optional
+      - libcppunit-dev
+      - wget
+  homebrew:
+    update: true
+    packages:
+      - ant
+      - wget
+      - libpq
+      - libewf
+      - gettext
+      - cppunit
+      - afflib
+      - testdisk
+
+python:
+  - 2.7
+
+before_install:
+  - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit
+  - python setupSleuthkitBranch.py
+
+install:
+  - pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd
+
+before_script:
+  - if [ $TRAVIS_OS_NAME = linux ]; then 
+        wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -;
+        echo \"deb [arch=amd64] https://apt.bell-sw.com/ stable main\" | sudo tee /etc/apt/sources.list.d/bellsoft.list; 
+        sudo apt-get update;
+        sudo apt-get install bellsoft-java11-full;
+        export PATH=/usr/bin:$PATH;
+        export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64; 
+    fi
+  - if [ $TRAVIS_OS_NAME = osx ]; then 
+        brew uninstall java --force --ignore-dependencies; 
+        brew cask uninstall java --force; 
+        brew tap bell-sw/liberica; 
+        brew cask install liberica-jdk11-full; 
+        export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11-full.jdk/Contents/Home;
+    fi
+    java -version
+
+script: ./travis_build.sh
\ No newline at end of file