From 072779d19a0c45fcf866ac6eabe011346d3a5d86 Mon Sep 17 00:00:00 2001
From: Fascinated <admin@fascinated.cc>
Date: Sat, 8 Jul 2023 01:11:54 +0100
Subject: [PATCH] move workflows to one file

---
 .gitea/workflows/upload-image-dev.yaml | 61 --------------------------
 .gitea/workflows/upload-image.yaml     | 42 +++++++++++++++---
 2 files changed, 35 insertions(+), 68 deletions(-)
 delete mode 100644 .gitea/workflows/upload-image-dev.yaml

diff --git a/.gitea/workflows/upload-image-dev.yaml b/.gitea/workflows/upload-image-dev.yaml
deleted file mode 100644
index 90c9099..0000000
--- a/.gitea/workflows/upload-image-dev.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Publish Docker Image (Development)
-
-on:
-  push:
-    branches:
-      - "development"
-
-jobs:
-  docker:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Restore Docker Cache
-        uses: actions/cache@v3
-        id: docker-cache
-        with:
-          path: /usr/bin/docker
-          key: ${{ runner.os }}-docker
-
-      - name: Install Docker (if not cached)
-        if: steps.docker-cache.outputs.cache-hit != 'true'
-        run: |
-          wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \
-          && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \
-          && rm -rf /tmp/* &&
-          echo "Done"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Repo
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.REPO_USERNAME }}
-          password: ${{ secrets.REPO_TOKEN }}
-
-      - name: Restore Docker Build Cache
-        uses: actions/cache@v3
-        id: build-cache
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx
-
-      - name: Build and Push
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: .
-          tags: fascinated/sharex-php-uploader:development
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-
-      - name: Save Docker Build Cache
-        if: steps.build-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p /tmp/.buildx-cache
-          cp -r /tmp/.buildx-cache/. /tmp/.buildx-cache-new
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/.gitea/workflows/upload-image.yaml b/.gitea/workflows/upload-image.yaml
index e08765b..df50a1b 100644
--- a/.gitea/workflows/upload-image.yaml
+++ b/.gitea/workflows/upload-image.yaml
@@ -1,34 +1,62 @@
-Actions name: Publish Docker Image
+name: Publish Docker Image
+
 on:
   push:
     branches:
       - "master"
+      - "development"
 
 jobs:
   docker:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: https://github.com/actions/checkout@v3
+        uses: actions/checkout@v3
 
-      - name: Download Docker
+      - name: Restore Docker Cache
+        uses: actions/cache@v3
+        id: docker-cache
+        with:
+          path: /usr/bin/docker
+          key: ${{ runner.os }}-docker
+
+      - name: Install Docker (if not cached)
+        if: steps.docker-cache.outputs.cache-hit != 'true'
         run: |
           wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \
           && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \
-          && rm -rf /tmp/*
+          && rm -rf /tmp/* &&
+          echo "Done"
 
       - name: Set up Docker Buildx
-        uses: https://github.com/docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Repo
-        uses: https://github.com/docker/login-action@v2
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
+      - name: Restore Docker Build Cache
+        uses: actions/cache@v3
+        id: build-cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx
+
       - name: Build and Push
         uses: docker/build-push-action@v4
         with:
           push: true
           context: .
-          tags: fascinated/sharex-php-uploader:latest
+          tags: fascinated/sharex-php-uploader:${{ gitea.branch }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Save Docker Build Cache
+        if: steps.build-cache.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p /tmp/.buildx-cache
+          cp -r /tmp/.buildx-cache/. /tmp/.buildx-cache-new
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache