Updated CircleCI build/test image.

Author: metasim

.circleci/.dockerignore

@@ -1,2 +1,3 @@
 *
 !requirements-conda.txt
+!fix-permissions

.circleci/Dockerfile

@@ -19,12 +19,14 @@ RUN \
 ENV CONDA_DIR=/opt/conda
 ENV PATH=$CONDA_DIR/bin:$PATH
 
-COPY requirements-conda.txt /tmp
+COPY requirements-conda.txt fix-permissions /tmp
 RUN \
     conda install --quiet --yes --channel=conda-forge --file=/tmp/requirements-conda.txt && \
     echo "$CONDA_DIR/lib" > /etc/ld.so.conf.d/conda.conf && \
     ldconfig && \
-    conda clean --all --force-pkgs-dirs --yes --quiet
+    conda clean --all --force-pkgs-dirs --yes --quiet && \
+    sh /tmp/fix-permissions $CONDA_DIR
+
 
 # Work-around for pyproj issue https://github.com/pyproj4/pyproj/issues/415
 ENV PROJ_LIB=/opt/conda/share/proj

.circleci/Makefile

@@ -1,11 +1,9 @@
 IMAGE_NAME=circleci-openjdk-conda-gdal
 SHA=$(shell git log -n1 --format=format:"%H" | cut -c 1-7)
 VERSION?=$(SHA)
-HOST=docker.pkg.github.com
-REPO=$(HOST)/locationtech/rasterframes
+HOST=docker.io
+REPO=$(HOST)/s22s
 FULL_NAME=$(REPO)/$(IMAGE_NAME):$(VERSION)
-GIT_USER?=metasim
-KEY?=$(HOME)/.github/repo-publish-key.txt
 
 .DEFAULT_GOAL := help
 help:
@@ -20,7 +18,7 @@ build: ## Build the docker image
 	docker build . -t ${FULL_NAME}
 
 login: ## Login to the docker registry
-	cat $(KEY) | docker login $(HOST) -u $(GIT_USER) --password-stdin
+	docker login
 
 push: login ## Push docker image to registry
 	docker push ${FULL_NAME}

.circleci/config.yml

@@ -6,11 +6,10 @@ orbs:
     executors:
       default:
         docker:
-          - image: s22s/miniconda-gdal:latest
+          - image: s22s/circleci-openjdk-conda-gdal:b8e30ee
         working_directory: ~/repo
         environment:
-          SBT_VERSION: 1.3.8
-          SBT_OPTS: -Xmx768m
+          SBT_OPTS: "-Xms64m -Xmx1536m -Djava.awt.headless=true -Dsun.io.serialization.extendedDebugInfo=true"
     commands:
       setup:
         description: Setup for sbt build
@@ -24,8 +23,7 @@ orbs:
         steps:
           - run:
               name: "Compile Scala via sbt"
-              command: |-
-                sbt -v -batch compile test:compile it:compile
+              command: sbt -v -batch compile test:compile it:compile
 
   python:
     commands:
@@ -60,6 +58,7 @@ orbs:
                 mkdir -p /tmp/core_dumps
                 ls -lh /tmp
                 cp core.* *.hs /tmp/core_dumps 2> /dev/null || true
+                cp core/* /tmp/core_dumps/ 2> /dev/null || true
                 cp -r /tmp/hsperfdata* /tmp/*.hprof /tmp/core_dumps 2> /dev/null || true
               when: on_fail
 
@@ -125,24 +124,23 @@ jobs:
 
       - run:
           name: "Scala Tests: core"
-          command: sbt -batch core/test
+          command: sbt -v -batch core/test
 
       - run:
           name: "Scala Tests: datasource"
-          command: sbt -batch datasource/test
+          command: sbt -v -batch datasource/test
 
       - run:
           name: "Scala Tests: experimental"
-          command: sbt -batch experimental/test
+          command: sbt -v -batch experimental/test
 
       - run:
           name: "Create PyRasterFrames package"
-          command: |-
-            sbt -v -batch pyrasterframes/package
+          command: sbt -v -batch pyrasterframes/package
 
       - run:
           name: "Python Tests"
-          command: sbt -batch pyrasterframes/test
+          command: sbt -v -batch pyrasterframes/test
 
       - rasterframes/save-artifacts
       - rasterframes/save-cache
@@ -249,4 +247,4 @@ workflows:
       - test
       - it
       - it-no-gdal
-      - docs
+      - docs

.circleci/fix-permissions

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -e
+
+GID=3434 # circleci
+
+for d in "$@"; do
+  find "$d" \
+    ! \( \
+      -group $GID \
+      -a -perm -g+rwX  \
+    \) \
+    -exec chgrp $GID {} \; \
+    -exec chmod g+rwX {} \;
+  # setuid,setgid *on directories only*
+  find "$d" \
+    \( \
+        -type d \
+        -a ! -perm -6000  \
+    \) \
+    -exec chmod +6000 {} \;
+done

project/RFAssemblyPlugin.scala

@@ -52,26 +52,19 @@ object RFAssemblyPlugin extends AutoPlugin {
       val shadePrefixes = Seq(
         "shapeless",
         "com.github.mpilquist",
-        "cats.kernel",
         "com.amazonaws",
         "org.apache.avro",
         "org.apache.http",
         "com.google.guava",
         "com.google.common",
         "com.typesafe.config",
         "com.fasterxml.jackson",
-        "io.netty"
+        "io.netty",
+        "spire",
+        "cats.kernel"
       )
       shadePrefixes.map(p => ShadeRule.rename(s"$p.**" -> s"shaded.rasterframes.$p.@1").inAll)
     },
-    assembly / assemblyShadeRules ++= Seq(
-      ShadeRule.rename("cats.kernel.**" -> s"shaded.rasterframes.cats.kernel.@1")
-        .inLibrary(RFDependenciesPlugin.autoImport.geotrellis("raster").value)
-        .inAll,
-      ShadeRule.rename("cats.kernel.**" -> s"shaded.spire.cats.kernel.@1")
-        .inLibrary("org.typelevel" %% "spire" % "0.17.0")
-        .inAll,
-    ),
     assembly / assemblyOption :=
       (assembly / assemblyOption).value.withIncludeScala(false),
     assembly / assemblyJarName := s"${normalizedName.value}-assembly-${version.value}.jar",