revert 9f7a6c39a3d318d064b1b9e2c00e8bfb097fff99 #11

Merged
jank merged 1 commits from jank-patch-1 into main 2024-08-16 12:33:15 +00:00
5 changed files with 42 additions and 65 deletions
Showing only changes of commit 1cccb1b7f0 - Show all commits

@ -1,19 +1,14 @@
name: Node npm name: Node npm
# Variable for the image name
env:
image_name: node-npm
on: on:
schedule: schedule:
- cron: "@weekly" - cron: "@weekly"
push: push:
branches: [main] branches: [main]
paths: paths:
- .gitea/workflows/${{ env.image_name }}.yaml - .gitea/workflows/node-npm.yaml
- images/actions/${{ env.image_name }}/** - images/actions/node-npm/**
pull_request: pull_request:
jobs: jobs:
build: build:
name: Build and push image name: Build and push image
@ -44,20 +39,20 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }} key: ${{ runner.os }}-node-npm-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ env.image_name }}- ${{ runner.os }}-node-npm-
- name: Build and push - name: Build and push
uses: https://git.kjan.de/actions/build-push-action@v6 uses: https://git.kjan.de/actions/build-push-action@v6
with: with:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max 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' }} push: ${{ github.ref == 'refs/heads/main' }}
tags: | tags: |
git.kjan.de/actions/${{ env.image_name }}:latest git.kjan.de/actions/node-npm:latest
git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }} git.kjan.de/actions/node-npm:${{ gitea.sha }}
- # Temp fix - # Temp fix
# https://github.com/docker/build-push-action/issues/252 # https://github.com/docker/build-push-action/issues/252
@ -65,4 +60,4 @@ jobs:
name: Move cache name: Move cache
run: | run: |
rm -rf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache

@ -1,17 +1,12 @@
name: Node ssh name: Node ssh
# Variable for the image name
env:
image_name: node-ssh
on: on:
schedule: schedule:
- cron: "@weekly" - cron: "@weekly"
push: push:
branches: [main] branches: [main]
paths: paths:
- .gitea/workflows/${{ env.image_name }}.yaml - .gitea/workflows/node-ssh.yaml
- images/actions/${{ env.image_name }}/** - images/actions/node-ssh/**
pull_request: pull_request:
jobs: jobs:
@ -44,20 +39,20 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }} key: ${{ runner.os }}-node-ssh-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ env.image_name }}- ${{ runner.os }}-node-ssh-
- name: Build and push - name: Build and push
uses: https://git.kjan.de/actions/build-push-action@v6 uses: https://git.kjan.de/actions/build-push-action@v6
with: with:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max 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' }} push: ${{ github.ref == 'refs/heads/main' }}
tags: | tags: |
git.kjan.de/actions/${{ env.image_name }}:latest git.kjan.de/actions/node-ssh:latest
git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }} git.kjan.de/actions/node-ssh:${{ gitea.sha }}
- # Temp fix - # Temp fix
# https://github.com/docker/build-push-action/issues/252 # https://github.com/docker/build-push-action/issues/252
@ -65,4 +60,4 @@ jobs:
name: Move cache name: Move cache
run: | run: |
rm -rf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache

@ -1,16 +1,12 @@
name: PHP 8.2 name: PHP 8.2
# Variable for the image name
env:
image_name: php-8.2
on: on:
schedule: schedule:
- cron: "@weekly" - cron: "@weekly"
push: push:
branches: [main] branches: [main]
paths: paths:
- .gitea/workflows/${{ env.image_name }}.yaml - .gitea/workflows/php-8.2.yaml
- images/actions/${{ env.image_name }}/** - images/actions/php-8.2/**
pull_request: pull_request:
jobs: jobs:
@ -43,20 +39,20 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }} key: ${{ runner.os }}-php-8-2-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ env.image_name }}- ${{ runner.os }}-php-8-2-
- name: Build and push - name: Build and push
uses: https://git.kjan.de/actions/build-push-action@v6 uses: https://git.kjan.de/actions/build-push-action@v6
with: with:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max 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' }} push: ${{ github.ref == 'refs/heads/main' }}
tags: | tags: |
git.kjan.de/actions/${{ env.image_name }}:latest git.kjan.de/actions/php-8.2:latest
git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }} git.kjan.de/actions/php-8.2:${{ gitea.sha }}
- # Temp fix - # Temp fix
# https://github.com/docker/build-push-action/issues/252 # https://github.com/docker/build-push-action/issues/252
@ -64,4 +60,5 @@ jobs:
name: Move cache name: Move cache
run: | run: |
rm -rf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache

@ -1,17 +1,12 @@
name: PHP deployer name: PHP deployer
# Variable for the image name
env:
image_name: php-deployer
on: on:
schedule: schedule:
- cron: "@weekly" - cron: "@weekly"
push: push:
branches: [main] branches: [main]
paths: paths:
- .gitea/workflows/${{ env.image_name }}.yaml - .gitea/workflows/php-deployer.yaml
- images/actions/${{ env.image_name }}/** - images/actions/php-deployer/**
pull_request: pull_request:
jobs: jobs:
@ -44,20 +39,20 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }} key: ${{ runner.os }}-php-deployer-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ env.image_name }}- ${{ runner.os }}-php-deployer-
- name: Build and push - name: Build and push
uses: https://git.kjan.de/actions/build-push-action@v6 uses: https://git.kjan.de/actions/build-push-action@v6
with: with:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max 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' }} push: ${{ github.ref == 'refs/heads/main' }}
tags: | tags: |
git.kjan.de/actions/${{ env.image_name }}:latest git.kjan.de/actions/php-deployer:latest
git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }} git.kjan.de/actions/php-deployer:${{ gitea.sha }}
- # Temp fix - # Temp fix
# https://github.com/docker/build-push-action/issues/252 # https://github.com/docker/build-push-action/issues/252
@ -65,4 +60,4 @@ jobs:
name: Move cache name: Move cache
run: | run: |
rm -rf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache

@ -1,17 +1,12 @@
name: Rust node name: Rust node
# Variable for the image name
env:
image_name: rust-node
on: on:
schedule: schedule:
- cron: "@weekly" - cron: "@weekly"
push: push:
branches: [main] branches: [main]
paths: paths:
- .gitea/workflows/${{ env.image_name }}.yaml - .gitea/workflows/rust-node.yaml
- images/actions/${{ env.image_name }}/** - images/actions/rust-node/**
pull_request: pull_request:
jobs: jobs:
@ -44,20 +39,20 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.image_name }}-${{ github.sha }} key: ${{ runner.os }}-rust-node-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ env.image_name }}- ${{ runner.os }}-rust-node-
- name: Build and push - name: Build and push
uses: https://git.kjan.de/actions/build-push-action@v6 uses: https://git.kjan.de/actions/build-push-action@v6
with: with:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max 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' }} push: ${{ github.ref == 'refs/heads/main' }}
tags: | tags: |
git.kjan.de/actions/${{ env.image_name }}:latest git.kjan.de/actions/rust-node:latest
git.kjan.de/actions/${{ env.image_name }}:${{ gitea.sha }} git.kjan.de/actions/rust-node:${{ gitea.sha }}
- # Temp fix - # Temp fix
# https://github.com/docker/build-push-action/issues/252 # https://github.com/docker/build-push-action/issues/252
@ -65,4 +60,4 @@ jobs:
name: Move cache name: Move cache
run: | run: |
rm -rf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache