ci: Cleanup macOS runs

.travis.yml

@@ -39,8 +39,6 @@ cache:
     - /usr/local/Homebrew
 before_cache:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
-  # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build
-  # - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi
 stages:
   - lint
   - test
@@ -95,28 +93,6 @@ jobs:
       script:
         - set -o errexit; source ./ci/extended_lint/06_script.sh
 
-    - stage: extended-lint
-      name: 'lint macOS 10.12 (compat)'
-      os: osx
-      # Use the earliest macOS that can build our lint dependencies:
-      # Xcode 8.3.3, macOS 10.12, JDK 1.8.0_112-b16
-      # https://docs.travis-ci.com/user/reference/osx/#macos-version
-      osx_image: xcode8.3
-      # TODO: if you're updating osx_image, try using "rvm:" to supply the
-      # version of ruby required by homebrew. Despite this "rvm:" declaration,
-      # brew update installs ruby 2.3.7 as its first action.
-      language: ruby
-      rvm:
-        - 2.3.7
-      env:
-      cache: false
-      install:
-        - set -o errexit; source ./ci/lint/04_install.sh
-      before_script:
-        - set -o errexit; source ./ci/lint/05_before_script.sh
-      script:
-        - set -o errexit; source ./ci/lint/06_script.sh
-
     - stage: test
       name: 'ARM  [GOAL: install]  [unit tests, no functional tests]'
       env: >-

ci/lint/04_install.sh

@@ -6,22 +6,9 @@
 
 export LC_ALL=C
 
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  # update first to install required ruby dependency
-  travis_retry brew update
-  travis_retry brew reinstall git -- --with-pcre2 # for  --perl-regexp
-  travis_retry brew install grep # gnu grep for --perl-regexp support
-  PATH="$(brew --prefix grep)/libexec/gnubin:$PATH"
-  travis_retry brew install shellcheck
-  travis_retry brew upgrade python
-  PATH="$(brew --prefix python)/bin:$PATH"
-  export PATH
-else
-  SHELLCHECK_VERSION=v0.6.0
-  travis_retry curl --silent "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
-  PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
-  export PATH
-fi
-
 travis_retry pip3 install codespell==1.15.0
 travis_retry pip3 install flake8==3.7.8
+
+SHELLCHECK_VERSION=v0.6.0
+curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
+export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"