From ed0cf6ad321718ff2d9e784187cdade0e04f3a5e Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:33:57 +0200
Subject: [PATCH] Add scratch, and incremental build tags

---
 .github/workflows/main.yml                    | 48 +++++++++++++++----
 {ctan => incremental}/Dockerfile              |  0
 .../Dockerfile                                |  4 +-
 3 files changed, 42 insertions(+), 10 deletions(-)
 rename {ctan => incremental}/Dockerfile (100%)
 rename ctan/Dockerfile.infraonly => scratch/Dockerfile (88%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f283121..0424449 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,8 +3,7 @@ name: Deploy
 on:
   push:
     branches: 
-      - master 
-      - github-actions
+      - master
   schedule:
     - cron: 0 18 * * *
 
@@ -18,17 +17,23 @@ jobs:
       run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
     - name: Build infraonly
-      working-directory: ./ctan
-      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly .
+      working-directory: ./scratch
+      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental .
       
+    - name: Upload infraonly-incremental image
+      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental
+
     - name: Upload infraonly image
-      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+      run: |
+        docker tag ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+        docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   build-incremental:
     runs-on: ubuntu-latest
     needs: [build-infraonly]
     strategy:
       max-parallel: 1
+      fail-fast: true
       matrix:
         scheme : [minimal, basic, small, context, gust, medium, tetex, full]
         include:
@@ -57,14 +62,39 @@ jobs:
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
       - name: Build ${{matrix.scheme}} 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
+        working-directory: ./incrental
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
+      - name: Upload ${{matrix.scheme}}-incremental
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental
+
       - name: Upload ${{matrix.scheme}}
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+        run: |
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
 
       - name: Tag as latest
         if: matrix.isLatest
         run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} ${{secrets.DOCKERHUB_USER}}/latex:latest
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
+
+  build-scratch:
+    runs-on: ubuntu-latest
+    needs: [build-infraonly]
+    strategy:
+      matrix:
+        scheme: [minimal, basic, small, context, gust, medium, tetex, full]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Login to Dockerhub
+        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+      
+      - name: Build ${{matrix.scheme}} from scratch
+        working-directory: ./scratch
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
+        
+      - name: Upload ${{matrix.scheme}}-scratch image
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch
\ No newline at end of file
diff --git a/ctan/Dockerfile b/incremental/Dockerfile
similarity index 100%
rename from ctan/Dockerfile
rename to incremental/Dockerfile
diff --git a/ctan/Dockerfile.infraonly b/scratch/Dockerfile
similarity index 88%
rename from ctan/Dockerfile.infraonly
rename to scratch/Dockerfile
index 9f564d3..190d872 100644
--- a/ctan/Dockerfile.infraonly
+++ b/scratch/Dockerfile
@@ -8,11 +8,13 @@ RUN apt-get update -q \
     && apt-get install -qy build-essential wget libfontconfig1 \
     && rm -rf /var/lib/apt/lists/*
 
+ARG SCHEME=infraonly
+
 # Install TexLive with scheme-infraonly
 RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \
     && mkdir /install-tl-unx \
     && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \
-    && echo "selected_scheme scheme-infraonly" >> /install-tl-unx/texlive.profile \
+    && echo "selected_scheme scheme-${SCHEME}" >> /install-tl-unx/texlive.profile \
     && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \
     && rm -r /install-tl-unx \
 	&& rm install-tl-unx.tar.gz