From 488a608c90d877baa33017ceae123ba392330c97 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 2 Sep 2025 20:05:49 +0200
Subject: [PATCH] chore(ci): simplify build steps

---
 .github/actions/docker-tags/action.yml | 23 +++++++++++++++++++-
 .github/workflows/docker-build.yml     | 29 ++------------------------
 build_helpers/publish_docker_arm64.sh  | 17 ---------------
 3 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/.github/actions/docker-tags/action.yml b/.github/actions/docker-tags/action.yml
index 60bb80cef..bac281d6d 100644
--- a/.github/actions/docker-tags/action.yml
+++ b/.github/actions/docker-tags/action.yml
@@ -21,6 +21,13 @@ runs:
         TAG_PLOT=${TAG}_plot
         TAG_FREQAI=${TAG}_freqai
         TAG_FREQAI_RL=${TAG_FREQAI}rl
+        TAG_FREQAI_TORCH=${TAG_FREQAI}torch
+
+        TAG_ARM=${TAG}_arm
+        TAG_PLOT_ARM=${TAG_PLOT}_arm
+        TAG_FREQAI_ARM=${TAG_FREQAI}_arm
+        TAG_FREQAI_RL_ARM=${TAG_FREQAI_RL}_arm
+
         TAG_PI="${TAG}_pi"
 
         CACHE_TAG_PI=${CACHE_IMAGE}:${TAG_PI}_cache
@@ -31,6 +38,11 @@ runs:
         echo "TAG_PLOT='${TAG_PLOT}'"
         echo "TAG_FREQAI='${TAG_FREQAI}'"
         echo "TAG_FREQAI_RL='${TAG_FREQAI_RL}'"
+        echo "TAG_FREQAI_TORCH='${TAG_FREQAI_TORCH}'"
+        echo "TAG_ARM='${TAG_ARM}'"
+        echo "TAG_PLOT_ARM='${TAG_PLOT_ARM}'"
+        echo "TAG_FREQAI_ARM='${TAG_FREQAI_ARM}'"
+        echo "TAG_FREQAI_RL_ARM='${TAG_FREQAI_RL_ARM}'"
         echo "TAG_PI='${TAG_PI}'"
 
         echo "BRANCH_NAME=${BRANCH_NAME}" >> "$GITHUB_ENV"
@@ -38,8 +50,17 @@ runs:
         echo "TAG_PLOT=${TAG_PLOT}" >> "$GITHUB_ENV"
         echo "TAG_FREQAI=${TAG_FREQAI}" >> "$GITHUB_ENV"
         echo "TAG_FREQAI_RL=${TAG_FREQAI_RL}" >> "$GITHUB_ENV"
+        echo "TAG_FREQAI_TORCH=${TAG_FREQAI_TORCH}" >> "$GITHUB_ENV"
+        echo "TAG_ARM=${TAG_ARM}" >> "$GITHUB_ENV"
+        echo "TAG_PLOT_ARM=${TAG_PLOT_ARM}" >> "$GITHUB_ENV"
+        echo "TAG_FREQAI_ARM=${TAG_FREQAI_ARM}" >> "$GITHUB_ENV"
+        echo "TAG_FREQAI_RL_ARM=${TAG_FREQAI_RL_ARM}" >> "$GITHUB_ENV"
         echo "TAG_PI=${TAG_PI}" >> "$GITHUB_ENV"
 
         echo "CACHE_TAG_PI=${CACHE_TAG_PI}" >> "$GITHUB_ENV"
 
-
+    - name: Save commit SHA to file
+      shell: bash
+      # Add commit to docker container
+      run: |
+        echo "${GITHUB_SHA}" > freqtrade_commit
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 67a6f6c22..8f3c23665 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,19 +37,9 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.12"
-
     - name: Set docker tag names
       uses: ./.github/actions/docker-tags
 
-    - name: Save commit SHA to file
-      # Add commit to docker container
-      run: |
-        echo "${GITHUB_SHA}" > freqtrade_commit
-
     - name: Login to Docker Hub
       uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
       with:
@@ -147,23 +137,8 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Extract branch name
-      env:
-        BRANCH_NAME_INPUT: ${{ github.event.inputs.branch_name }}
-      run: |
-        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-          BRANCH_NAME="${BRANCH_NAME_INPUT}"
-        else
-          BRANCH_NAME="${GITHUB_REF##*/}"
-        fi
-        echo "GITHUB_REF='${GITHUB_REF}'"
-        echo "BRANCH_NAME='${BRANCH_NAME}'"
-        echo "BRANCH_NAME=${BRANCH_NAME}" >> "$GITHUB_ENV"
-
-    - name: Save commit SHA to file
-      # Add commit to docker container
-      run: |
-        echo "${GITHUB_SHA}" > freqtrade_commit
+    - name: Set docker tag names
+      uses: ./.github/actions/docker-tags
 
     - name: Login to Docker Hub
       uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
diff --git a/build_helpers/publish_docker_arm64.sh b/build_helpers/publish_docker_arm64.sh
index 990f23e81..b5bebbf83 100755
--- a/build_helpers/publish_docker_arm64.sh
+++ b/build_helpers/publish_docker_arm64.sh
@@ -1,25 +1,8 @@
 #!/bin/sh
 
-# Use BuildKit, otherwise building on ARM fails
-
-# Replace / with _ to create a valid tag
-TAG=$(echo "${BRANCH_NAME}" | sed -e "s/\//_/g")
-TAG_PLOT=${TAG}_plot
-TAG_FREQAI=${TAG}_freqai
-TAG_FREQAI_RL=${TAG_FREQAI}rl
-TAG_FREQAI_TORCH=${TAG_FREQAI}torch
-TAG_PI="${TAG}_pi"
-
-TAG_ARM=${TAG}_arm
-TAG_PLOT_ARM=${TAG_PLOT}_arm
-TAG_FREQAI_ARM=${TAG_FREQAI}_arm
-TAG_FREQAI_RL_ARM=${TAG_FREQAI_RL}_arm
 
 echo "Running for ${TAG}"
 
-# Add commit and commit_message to docker container
-echo "${GITHUB_SHA}" > freqtrade_commit
-
 if [ "${GITHUB_EVENT_NAME}" = "schedule" ]; then
     echo "event ${GITHUB_EVENT_NAME}: full rebuild - skipping cache"
     # Build regular image