From 14316f206af70fd79994028123498a5b70b3f92f Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 22 Sep 2019 16:42:05 -0400
Subject: Package mill as a container image

---
 .github/workflows/main.yml | 24 ++++++++++++++----------
 ci/mill/Dockerfile         | 12 ++++++++++++
 ci/test/Dockerfile         |  3 ---
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 ci/mill/Dockerfile
 delete mode 100644 ci/test/Dockerfile

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8fdd637..09ef970 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,20 +3,24 @@ name: CI
 on: [push]
 
 jobs:
-  build:
 
+  build:
     runs-on: ubuntu-latest
     
     steps:
     - uses: actions/checkout@v1
     - name: Import key
       run: echo "${{secrets.GPG_KEY}}" | gpg --import
-    - name: Setup mill
-      run: |
-        curl -L https://github.com/lihaoyi/mill/releases/download/0.5.1/0.5.1 | sudo tee /usr/local/bin/mill > /dev/null
-        sudo chmod +x /usr/local/bin/mill
-    - name: Run tests
-      run: mill commando.test
-    - name: Publish
-      run: mill mill.scalalib.PublishModule/publishAll --sonatypeCreds "8VNUX6+2:${{secrets.dummy}}" --publishArtifacts __.publishArtifacts
-    - uses: ./ci/test
+    - name: run tests
+      uses: ./ci/mill
+      with:
+        args: commando.test
+    # - name: Setup mill
+    #   run: |
+    #     curl -L https://github.com/lihaoyi/mill/releases/download/0.5.1/0.5.1 | sudo tee /usr/local/bin/mill > /dev/null
+    #     sudo chmod +x /usr/local/bin/mill
+    # - name: Run tests
+    #   run: mill commando.test
+    # - name: Publish
+    #   run: mill mill.scalalib.PublishModule/publishAll --sonatypeCreds "8VNUX6+2:${{secrets.dummy}}" --publishArtifacts __.publishArtifacts
+    # - uses: ./ci/test
diff --git a/ci/mill/Dockerfile b/ci/mill/Dockerfile
new file mode 100644
index 0000000..af1ba37
--- /dev/null
+++ b/ci/mill/Dockerfile
@@ -0,0 +1,12 @@
+FROM debian:bullseye
+
+RUN apt-get update && apt-get install --yes \
+        curl \
+        openjdk-11-jdk \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -L https://github.com/lihaoyi/mill/releases/download/0.5.1/0.5.1 > \
+    /usr/local/bin/mill \
+    && chmod +x /usr/local/bin/mill
+
+ENTRYPOINT [ "/usr/local/bin/mill" ]
diff --git a/ci/test/Dockerfile b/ci/test/Dockerfile
deleted file mode 100644
index 00b7b89..0000000
--- a/ci/test/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM debian:bullseye
-
-CMD [ "echo", "hello world!"]
-- 
cgit v1.2.3