From ec1bc5963bdc1c4788b056cfd65118881f88270e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannik=20Schr=C3=B6der?= <jannik.schroeder05@gmail.com>
Date: Mon, 5 Aug 2024 08:54:25 +0200
Subject: [PATCH] Revert "Added version increment"

This reverts commit d03d7ab6d1ef13ea205dcb845fda1741f1e64238.
---
 .github/workflows/docker-build.yml | 77 ++++++------------------------
 1 file changed, 14 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7ef9b55..85f1cd6 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,4 +1,4 @@
-name: Version Increment and Build Docker Image
+name: Build and Push Docker image
 
 on:
   push:
@@ -6,72 +6,17 @@ on:
       - main
 
 jobs:
-  increment_version:
+  docker:
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
     steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "16"
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Increment version
-        id: version
-        run: |
-          npm run release
-          VERSION=$(node -p "require('./package.json').version")
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
-
-      - name: Commit version changes
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -b version-bump
-          git add package.json yarn.lock
-          git commit -m "chore: bump version to ${{ env.VERSION }}"
-          git push origin version-bump
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "chore: bump version to ${{ env.VERSION }}"
-          branch: version-bump
-          title: "chore: bump version to ${{ env.VERSION }}"
-          body: "Automatically incremented version based on changes in main."
-          base: main
-
-  build_and_push:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true
-    needs: increment_version
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "16"
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Get package version
-        id: version
-        run: echo "VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
+      - name: Check out the repo
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -79,18 +24,22 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Extract package version
+        id: package_version
+        run: echo "version=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: driaug/plunk
           tags: |
-            type=raw,value=${{ env.VERSION }}
+            type=raw,value=${{ env.version }}
             type=raw,value=latest
 
       - name: Build and push
@@ -105,6 +54,8 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
       # Temp fix
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
       - name: Move cache
         run: |
           rm -rf /tmp/.buildx-cache