Remove unused GitHub workflows, build script, Dockerfiles and update …

…script; update Makefile.
mattocci27 · Mar 6, 2024 · 6e08e34 · 6e08e34
1 parent 940c0cf
commit 6e08e34
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 318 deletions.
diff --git a/.github/workflows/update.yml → .github/workflows/update_amd64.yml b/.github/workflows/update.yml → .github/workflows/update_amd64.yml
@@ -25,13 +25,15 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          key: ${{runner.os}}-poetry-${{hashFiles('**/poetry.lock')}}
           restore-keys: |
-            ${{ runner.os }}-poetry-
+            ${{runner.os}}-poetry-
 
       - run: |
           poetry --version
           poetry install
+          poetry run python scripts/update.py
+          poetry run python scripts/generate_yml.py
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -42,10 +44,10 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{secrets.DOCKER_USER}}
+          password: ${{secrets.DOCKER_PASSWORD}}
 
-      - name: Build and push radian_4.3.2
+      - name: Build and push radian_4.3.2 for amd64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -54,7 +56,7 @@ jobs:
           platforms: linux/amd64
           tags: mattocci/radian:4.3.2
 
-      - name: Build and push radian-verse_4.3.2
+      - name: Build and push radian-verse_4.3.2 for amd64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -63,7 +65,7 @@ jobs:
           platforms: linux/amd64
           tags: mattocci/radian-verse:4.3.2
 
-      - name: Build and push cmdstan-verse_4.3.2
+      - name: Build and push cmdstan-verse_4.3.2 for amd64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -72,11 +74,12 @@ jobs:
           platforms: linux/amd64
           tags: mattocci/cmdstan-verse:4.3.2
 
-      - name: Build and push cmdstan-verse-zsh_4.3.2
+      - name: Build and push cmdstan-verse-zsh_4.3.2 for amd64
         uses: docker/build-push-action@v5
         with:
           context: .
           file: images/cmdstan-verse-zsh_4.3.2/Dockerfile
           push: true
           platforms: linux/amd64
           tags: mattocci/cmdstan-verse-zsh:4.3.2
+
diff --git a/.github/workflows/test.yml → .github/workflows/update_arm64.yml b/.github/workflows/test.yml → .github/workflows/update_arm64.yml
@@ -25,13 +25,15 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          key: ${{runner.os}}-poetry-${{hashFiles('**/poetry.lock')}}
           restore-keys: |
-            ${{ runner.os }}-poetry-
+            ${{runner.os}}-poetry-
 
       - run: |
           poetry --version
           poetry install
+          poetry run python scripts/update.py
+          poetry run python scripts/generate_yml.py
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -42,10 +44,10 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{secrets.DOCKER_USER}}
+          password: ${{secrets.DOCKER_PASSWORD}}
 
-      - name: Build and push radian_4.3.2
+      - name: Build and push radian_4.3.2 for arm64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -54,7 +56,7 @@ jobs:
           platforms: linux/arm64
           tags: mattocci/radian:4.3.2
 
-      - name: Build and push radian-verse_4.3.2
+      - name: Build and push radian-verse_4.3.2 for arm64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -63,7 +65,7 @@ jobs:
           platforms: linux/arm64
           tags: mattocci/radian-verse:4.3.2
 
-      - name: Build and push cmdstan-verse_4.3.2
+      - name: Build and push cmdstan-verse_4.3.2 for arm64
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -72,11 +74,12 @@ jobs:
           platforms: linux/arm64
           tags: mattocci/cmdstan-verse:4.3.2
 
-      - name: Build and push cmdstan-verse-zsh_4.3.2
+      - name: Build and push cmdstan-verse-zsh_4.3.2 for arm64
         uses: docker/build-push-action@v5
         with:
           context: .
           file: images/cmdstan-verse-zsh_4.3.2/Dockerfile
           push: true
           platforms: linux/arm64
           tags: mattocci/cmdstan-verse-zsh:4.3.2
+
diff --git a/Makefile b/Makefile
@@ -1,10 +1,14 @@
 .PHONY: all
 LATEST_TAG = 4.3.2
 
-all: update compose push_docker
+all: update update_yml compose push_docker
 
 .PHONY: update
-update: update.py images.json
+update: scripts/update.py images.json
+	poetry run python3 $<
+
+.PHONY: update_yml
+update_yml: scripts/generate_yml.py templates/update_template.yml.jinja
 	poetry run python3 $<
 
 .PHONY: compose

diff --git a/build_images.py b/build_images.py
diff --git a/images/tinytex_4.3.2/Dockerfile b/images/tinytex_4.3.2/Dockerfile
diff --git a/images/tinytex_4.3.2/Makefile b/images/tinytex_4.3.2/Makefile