From 1cccb1b7f00e1b4e6c19a61593db46ead4d003f2 Mon Sep 17 00:00:00 2001
From: Jan Gleytenhoover <krisellp9@gmail.com>
Date: Fri, 16 Aug 2024 12:29:17 +0000
Subject: [PATCH] revert 9f7a6c39a3d318d064b1b9e2c00e8bfb097fff99

revert Update .gitea/workflows/node-npm.yaml (#10)

Reviewed-on: https://git.kjan.de/actions/runner-images/pulls/10
---
 .gitea/workflows/node-npm.yaml     | 23 +++++++++--------------
 .gitea/workflows/node-ssh.yaml     | 21 ++++++++-------------
 .gitea/workflows/php-8.2.yaml      | 21 +++++++++------------
 .gitea/workflows/php-deployer.yaml | 21 ++++++++-------------
 .gitea/workflows/rust-node.yaml    | 21 ++++++++-------------
 5 files changed, 42 insertions(+), 65 deletions(-)

diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml
index 81d4b75..32aa7ad 100644
--- a/.gitea/workflows/node-npm.yaml
+++ b/.gitea/workflows/node-npm.yaml
@@ -1,19 +1,14 @@
 name: Node npm
-
-# Variable for the image name
-env:
-  image_name: node-npm
-
 on:
   schedule:
     - cron: "@weekly"
   push:
     branches: [main]
     paths:
-      - .gitea/workflows/${{ env.image_name }}.yaml
-      - images/actions/${{ env.image_name }}/**
+      - .gitea/workflows/node-npm.yaml
+      - images/actions/node-npm/**
   pull_request:
-
+    
 jobs:
   build:
     name: Build and push image
@@ -44,20 +39,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }}
+        key: ${{ runner.os }}-node-npm-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.image_name }}-
+          ${{ runner.os }}-node-npm-      
 
     - name: Build and push
       uses: https://git.kjan.de/actions/build-push-action@v6
       with:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/${{ env.image_name }}
+        context: ./images/actions/node-npm
         push: ${{ github.ref == 'refs/heads/main' }}
         tags: |
-          git.kjan.de/actions/${{ env.image_name }}:latest
-          git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }}             
+          git.kjan.de/actions/node-npm:latest
+          git.kjan.de/actions/node-npm:${{ gitea.sha }}   
 
     - # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -65,4 +60,4 @@ jobs:
       name: Move cache
       run: |
         rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache               
diff --git a/.gitea/workflows/node-ssh.yaml b/.gitea/workflows/node-ssh.yaml
index 8874d49..0bd7c69 100644
--- a/.gitea/workflows/node-ssh.yaml
+++ b/.gitea/workflows/node-ssh.yaml
@@ -1,17 +1,12 @@
 name: Node ssh
-
-# Variable for the image name
-env:
-  image_name: node-ssh
-
 on:
   schedule:
     - cron: "@weekly"
   push:
     branches: [main]
     paths:
-      - .gitea/workflows/${{ env.image_name }}.yaml
-      - images/actions/${{ env.image_name }}/**
+      - .gitea/workflows/node-ssh.yaml
+      - images/actions/node-ssh/**
   pull_request:
 
 jobs:
@@ -44,20 +39,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }}
+        key: ${{ runner.os }}-node-ssh-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.image_name }}-          
+          ${{ runner.os }}-node-ssh-   
 
     - name: Build and push
       uses: https://git.kjan.de/actions/build-push-action@v6
       with:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/${{ env.image_name }}
+        context: ./images/actions/node-ssh
         push: ${{ github.ref == 'refs/heads/main' }}
         tags: |
-          git.kjan.de/actions/${{ env.image_name }}:latest
-          git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }}                       
+          git.kjan.de/actions/node-ssh:latest
+            git.kjan.de/actions/node-ssh:${{ gitea.sha }}       
 
     - # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -65,4 +60,4 @@ jobs:
       name: Move cache
       run: |
         rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache        
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache             
diff --git a/.gitea/workflows/php-8.2.yaml b/.gitea/workflows/php-8.2.yaml
index ad12b69..944f9dc 100644
--- a/.gitea/workflows/php-8.2.yaml
+++ b/.gitea/workflows/php-8.2.yaml
@@ -1,16 +1,12 @@
 name: PHP 8.2
-# Variable for the image name
-env:
-  image_name: php-8.2
-
 on:
   schedule:
     - cron: "@weekly"
   push:
     branches: [main]
     paths:
-      - .gitea/workflows/${{ env.image_name }}.yaml
-      - images/actions/${{ env.image_name }}/**
+      - .gitea/workflows/php-8.2.yaml
+      - images/actions/php-8.2/**
   pull_request:
 
 jobs:
@@ -43,20 +39,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }}
+        key: ${{ runner.os }}-php-8-2-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.image_name }}-          
+          ${{ runner.os }}-php-8-2-       
 
     - name: Build and push
       uses: https://git.kjan.de/actions/build-push-action@v6
       with:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/${{ env.image_name }}
+        context: ./images/actions/php-8.2
         push: ${{ github.ref == 'refs/heads/main' }}
         tags: |
-          git.kjan.de/actions/${{ env.image_name }}:latest
-          git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }}                       
+          git.kjan.de/actions/php-8.2:latest
+            git.kjan.de/actions/php-8.2:${{ gitea.sha }}     
 
     - # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -64,4 +60,5 @@ jobs:
       name: Move cache
       run: |
         rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache        
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache                        
+
diff --git a/.gitea/workflows/php-deployer.yaml b/.gitea/workflows/php-deployer.yaml
index 3982f46..7be1b51 100644
--- a/.gitea/workflows/php-deployer.yaml
+++ b/.gitea/workflows/php-deployer.yaml
@@ -1,17 +1,12 @@
 name: PHP deployer
-
-# Variable for the image name
-env:
-  image_name: php-deployer
-
 on:
   schedule:
     - cron: "@weekly"
   push:
     branches: [main]
     paths:
-      - .gitea/workflows/${{ env.image_name }}.yaml
-      - images/actions/${{ env.image_name }}/**
+      - .gitea/workflows/php-deployer.yaml
+      - images/actions/php-deployer/**
   pull_request:
 
 jobs:
@@ -44,20 +39,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }}
+        key: ${{ runner.os }}-php-deployer-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.image_name }}-          
+          ${{ runner.os }}-php-deployer- 
 
     - name: Build and push
       uses: https://git.kjan.de/actions/build-push-action@v6
       with:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/${{ env.image_name }}
+        context: ./images/actions/php-deployer
         push: ${{ github.ref == 'refs/heads/main' }}
         tags: |
-          git.kjan.de/actions/${{ env.image_name }}:latest
-          git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }}                       
+          git.kjan.de/actions/php-deployer:latest
+            git.kjan.de/actions/php-deployer:${{ gitea.sha }}            
 
     - # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -65,4 +60,4 @@ jobs:
       name: Move cache
       run: |
         rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache        
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache                
diff --git a/.gitea/workflows/rust-node.yaml b/.gitea/workflows/rust-node.yaml
index dcecd3c..d6cd93c 100644
--- a/.gitea/workflows/rust-node.yaml
+++ b/.gitea/workflows/rust-node.yaml
@@ -1,17 +1,12 @@
 name: Rust node
-
-# Variable for the image name
-env:
-  image_name: rust-node
-
 on:
   schedule:
     - cron: "@weekly"
   push:
     branches: [main]
     paths:
-      - .gitea/workflows/${{ env.image_name }}.yaml
-      - images/actions/${{ env.image_name }}/**
+      - .gitea/workflows/rust-node.yaml
+      - images/actions/rust-node/**
   pull_request:
 
 jobs:
@@ -44,20 +39,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }}
+        key: ${{ runner.os }}-rust-node-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.image_name }}-          
+          ${{ runner.os }}-rust-node-   
 
     - name: Build and push
       uses: https://git.kjan.de/actions/build-push-action@v6
       with:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        context: ./images/actions/${{ env.image_name }}
+        context: ./images/actions/rust-node
         push: ${{ github.ref == 'refs/heads/main' }}
         tags: |
-          git.kjan.de/actions/${{ env.image_name }}:latest
-          git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }}                       
+          git.kjan.de/actions/rust-node:latest
+          git.kjan.de/actions/rust-node:${{ gitea.sha }}       
 
     - # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -65,4 +60,4 @@ jobs:
       name: Move cache
       run: |
         rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache        
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache      
-- 
2.45.2