[1] update actions

.github/workflows/develop.yml

@@ -3,13 +3,18 @@ name: Docker Develop Release
 on:
   push:
     branches: [ develop ]
-  pull_request:
-    branches: [ develop ]
 
 jobs:
 
   docker:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node:
+          - tag: develop
+            file: Dockerfile
+          - tag: lxml-develop
+            file: Dockerfile.lxml
     steps:
 
       - name: Check Out Repo
@@ -37,47 +42,21 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.node.file }}
           build-args: |
             "BRANCH_NAME=develop"
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: kometateam/kometa:develop
+          tags: kometateam/kometa:${{ matrix.node.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Build and Push lxml Version
-        id: docker_build_lxml
-        uses: docker/build-push-action@v5
-        with:
-          context: ./
-          file: ./Dockerfile.lxml
-          build-args: |
-            "BRANCH_NAME=develop"
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: kometateam/kometa:lxml-develop
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Send Discord Commit Notification
-        uses: Kometa-Team/discord-notifications@master
-        with:
-          webhook_id_token: ${{ secrets.DEVELOP_WEBHOOK }}
-          title: Commits
-          message: "<@&954835263731949623> - An update to Kometa has been published and is available to users of the **develop** branch.\n\nWe **strongly** recommend users who previously switched to the `nightly` branch to resolve any previous issues to now switch back to the `develop` branch now."
-          commits: "true"
-          username: Kobota
-          avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/logo.png
-          author: ${{ secrets.REPO_NAME }} Develop Release
-          author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/release.png
-
       - name: Discord Success Notification
         uses: Kometa-Team/discord-notifications@master
         if: success()
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
-          title: "${{ secrets.REPO_NAME }} develop: **Build Successful**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Successful**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 844716
           username: Kobota
@@ -91,10 +70,28 @@ jobs:
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
           message: <@&1079153184007790652>
-          title: "${{ secrets.REPO_NAME }} develop: **Build Failed**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Failed**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 14879811
           username: Kobota
           avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/logo.png
           author: Docker
           author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/docker.png
+
+  commit-notification:
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    needs: [docker]
+    steps:
+
+      - name: Send Discord Commit Notification
+        uses: Kometa-Team/discord-notifications@master
+        with:
+          webhook_id_token: ${{ secrets.DEVELOP_WEBHOOK }}
+          title: Commits
+          message: "<@&954835263731949623> - An update to Kometa has been published and is available to users of the **develop** branch.\n\nWe **strongly** recommend users who previously switched to the `nightly` branch to resolve any previous issues to now switch back to the `develop` branch now."
+          commits: "true"
+          username: Kobota
+          avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/logo.png
+          author: ${{ secrets.REPO_NAME }} Develop Release
+          author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/develop/.github/release.png

.github/workflows/latest.yml

@@ -8,6 +8,13 @@ jobs:
 
   docker:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node:
+          - tag: latest
+            file: Dockerfile
+          - tag: lxml-latest
+            file: Dockerfile.lxml
     steps:
 
       - name: Check Out Repo
@@ -33,22 +40,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.node.file }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: kometateam/kometa:latest
+          tags: kometateam/kometa:${{ matrix.node.tag }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and Push lxml Version
-        id: docker_build_lxml
-        uses: docker/build-push-action@v5
-        with:
-          context: ./
-          file: ./Dockerfile.lxml
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: kometateam/kometa:lxml-latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -57,7 +52,7 @@ jobs:
         if: success()
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
-          title: "${{ secrets.REPO_NAME }} latest: **Build Successful**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Successful**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 844716
           username: Kobota
@@ -71,7 +66,7 @@ jobs:
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
           message: <@&1079153184007790652>
-          title: "${{ secrets.REPO_NAME }} latest: **Build Failed**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Failed**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 14879811
           username: Kobota

.github/workflows/nightly.yml

@@ -3,13 +3,18 @@ name: Docker Nightly Release
 on:
   push:
     branches: [ nightly ]
-  pull_request:
-    branches: [ nightly ]
 
 jobs:
 
   docker:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node:
+          - tag: nightly
+            file: Dockerfile
+          - tag: lxml-nightly
+            file: Dockerfile.lxml
     steps:
 
       - name: Check Out Repo
@@ -37,47 +42,21 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.node.file }}
-          build-args: |
-            "BRANCH_NAME=nightly"
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: kometateam/kometa:nightly
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and Push lxml Version
-        id: docker_build_lxml
-        uses: docker/build-push-action@v5
-        with:
-          context: ./
-          file: ./Dockerfile.lxml
           build-args: |
             "BRANCH_NAME=nightly"
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: kometateam/kometa:lxml-nightly
+          tags: kometateam/kometa:${{ matrix.node.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Send Discord Commit Notification
-        uses: Kometa-Team/discord-notifications@master
-        with:
-          webhook_id_token: ${{ secrets.DEVELOP_WEBHOOK }}
-          title: Commits
-          message: "<@&967002147520675840> - An update to Kometa has now been published and is available to users of the **nightly** branch."
-          commits: "true"
-          username: Kobota
-          avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/logo.png
-          author: ${{ secrets.REPO_NAME }} Nightly Release
-          author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/release.png
-
       - name: Discord Success Notification
         uses: Kometa-Team/discord-notifications@master
         if: success()
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
-          title: "${{ secrets.REPO_NAME }} nightly: **Build Successful**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Successful**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 844716
           username: Kobota
@@ -91,10 +70,28 @@ jobs:
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
           message: <@&1079153184007790652>
-          title: "${{ secrets.REPO_NAME }} nightly: **Build Failed**"
+          title: "${{ secrets.REPO_NAME }} ${{ matrix.node.tag }}: **Build Failed**"
           url: https://github.com/Kometa-Team/${{ secrets.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: 14879811
           username: Kobota
           avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/logo.png
           author: Docker
           author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/docker.png
+
+  commit-notification:
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    needs: [docker]
+    steps:
+
+      - name: Send Discord Commit Notification
+        uses: Kometa-Team/discord-notifications@master
+        with:
+          webhook_id_token: ${{ secrets.NIGHTLY_WEBHOOK }}
+          title: Commits
+          message: "<@&967002147520675840> - An update to Kometa has now been published and is available to users of the **nightly** branch."
+          commits: "true"
+          username: Kobota
+          avatar_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/logo.png
+          author: ${{ secrets.REPO_NAME }} Nightly Release
+          author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/nightly/.github/release.png

.github/workflows/release.yml

@@ -14,8 +14,7 @@ jobs:
       - name: Send Discord Release Notification
         uses: Kometa-Team/discord-notifications@master
         with:
-          webhook_id: ${{ secrets.RELEASE_WEBHOOK_ID }}
+          webhook_id_token: ${{ secrets.RELEASE_WEBHOOK }}
-          webhook_token: ${{ secrets.RELEASE_WEBHOOK_TOKEN }}
           release: true
           title: Release VERSION
           message: "<@&967002324646113290> - A new version of Kometa has been released and is available to all users.\n\nWe **strongly** recommend users who previously switched to the `nightly` or `develop` branches to resolve any previous issues to now switch back to the `latest` branch now."

.github/workflows/version.yml

@@ -9,6 +9,13 @@ jobs:
 
   docker:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node:
+          - tag: ""
+            file: Dockerfile
+          - tag: lxml-
+            file: Dockerfile.lxml
 
     steps:
 
@@ -41,22 +48,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.node.file }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: kometateam/kometa:${{ steps.get_version.outputs.VERSION }}
+          tags: kometateam/kometa:${{ matrix.node.tag }}${{ steps.get_version.outputs.VERSION }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and Push lxml Version
-        id: docker_build_lxml
-        uses: docker/build-push-action@v5
-        with:
-          context: ./
-          file: ./Dockerfile.lxml
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: kometateam/kometa:lxml-${{ steps.get_version.outputs.VERSION }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -87,6 +82,21 @@ jobs:
           author: Docker
           author_icon_url: https://raw.githubusercontent.com/Kometa-Team/Kometa/master/.github/docker.png
 
+  commit-notification:
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    needs: [docker]
+    steps:
+
+      - name: Check Out Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get the version
+        id: get_version
+        run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+
       - name: Checkout Configs Repo
         uses: actions/checkout@v4
         with:

VERSION

@@ -1 +1 @@
-1.21.1
+1.21.1-develop1