From 1fbb9ea1dbf14673fdf237acfcda4b6e0035848b Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 26 Apr 2021 21:46:15 -0400 Subject: [PATCH] Remove ubuntu executor from Circle --- .circleci/config.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a98cd1e..886f935e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,6 @@ executors: scala_jdk16_executor: docker: - image: circleci/openjdk:16-buster - scala_native_executor: - machine: - image: ubuntu-1604:202004-01 commands: sbt_cmd: @@ -77,7 +74,7 @@ jobs: scala_version: << parameters.scala_version >> sbt_tasks: xmlJS/update xmlJS/compile xmlJS/Test/compile xmlJS/test xmlJS/doc xmlJS/package scalanative_job: - executor: scala_native_executor + executor: scala_jdk8_executor parameters: scala_version: description: "Scala version" @@ -94,12 +91,10 @@ jobs: - run: name: Install dependencies command: | - echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list - curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add sudo apt-get update - sudo apt-get install -y sbt clang-8 openjdk-8-jdk - sudo ln -s /usr/lib/llvm-8/bin/clang /usr/bin/clang - sudo ln -s /usr/lib/llvm-8/bin/clang++ /usr/bin/clang++ + sudo apt-get install -y clang-7 + sudo ln -s /usr/lib/llvm-7/bin/clang /usr/local/bin/clang + sudo ln -s /usr/lib/llvm-7/bin/clang++ /usr/local/bin/clang++ - sbt_cmd: scala_version: << parameters.scala_version >> sbt_tasks: xmlNative/update xmlNative/compile xmlNative/test:compile xmlNative/test xmlNative/doc xmlNative/package