From c0284497e3cdf10d722af29eda3e20e0b1f969db Mon Sep 17 00:00:00 2001
From: VintagePC <53943260+vintagepc@users.noreply.github.com>
Date: Fri, 1 Mar 2024 20:00:27 -0500
Subject: [PATCH 1/7] Facilitate automatic release uploads of artifacts

---
 .github/workflows/build.yml | 12 ++++++++++++
 CMakeLists.txt              | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10f103d87..9cab9858d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,8 @@ on:
   pull_request:
     branches:
     - '*'
+    tags:
+    - 'v*'
   push:
     branches: [ MK3, MK3_* ]
 
@@ -66,6 +68,16 @@ jobs:
         name: Firmware
         path: build/*.hex
 
+    - name: RELEASE THE KRAKEN
+      if: startsWith(github.ref, 'refs/tags/v')
+      uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        draft: true
+        files: |
+          "build/release/*.hex"
+          "build/release/*.zip"
+
   check-lang:
     runs-on: ubuntu-latest
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1d204cc3..60b275f65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -545,6 +545,8 @@ function(fw_add_variant variant_name)
       BYPRODUCTS ${LANG_HEX}
       COMMAND ${CMAKE_COMMAND} -E create_hardlink ${FW_LANG_FINAL}.hex ${LANG_DEBUG_HEX}
       BYPRODUCTS ${LANG_DEBUG_HEX}
+      COMMAND ${CMAKE_COMMAND} -E create_hardlink ${FW_LANG_FINAL}.hex ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_DEBUG_SUFFIX}_MULTILANG.hex
+      BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_DEBUG_SUFFIX}_MULTILANG.hex
       DEPENDS ${FW_LANG_PATCH}.hex ${LANG_CATHEX}
       COMMENT "Generating final ${FW_LANG_FINAL}.hex"
       )
@@ -586,6 +588,13 @@ function(fw_add_variant variant_name)
       list(APPEND ALL_VARIANT_HEXES ${FW_LANG_FINAL})
     endforeach()
     add_custom_target("${variant_name}-All-Languages" DEPENDS ${ALL_VARIANT_HEXES})
+    add_custom_command(TARGET "${variant_name}-All-Languages"
+      POST_BUILD
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND ${CMAKE_COMMAND} -E make_directory "release"
+      COMMAND ${CMAKE_COMMAND} -E tar "cfv" "release/${variant_name}_${FN_VERSION_SUFFIX}.zip" --format=zip ${variant_name}_${FN_VERSION_DEBUG_SUFFIX}_en*.hex
+      BYPRODUCTS "${CMAKE_BINARY_DIR}/release/${variant_name}_${FN_VERSION_SUFFIX}.zip"
+      )
     add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages")
   endif()
 endfunction()
@@ -628,6 +637,16 @@ if(CMAKE_CROSSCOMPILING)
   endforeach(THIS_VAR IN LISTS FW_VARIANTS)
 endif()
 
+SET(REVO_FW_ZIP_NAME "E3D_REVO_FW_MK3_MK3S_MK3S+_${FN_VERSION_SUFFIX}.zip")
+
+add_custom_command(TARGET ALL_MULTILANG
+  POST_BUILD
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/release
+  BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${REVO_FW_ZIP_NAME}
+  COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${REVO_FW_ZIP_NAME}" --format=zip *E3DREVO*.hex
+  COMMAND ${CMAKE_COMMAND} -E rm *E3DREVO*.hex
+  )
+
 #
 # Tests
 #

From 361627d91deb89f9d4493593824438caf07f9bab Mon Sep 17 00:00:00 2001
From: VintagePC <53943260+vintagepc@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:51:11 -0500
Subject: [PATCH 2/7] Use simplified filenames without hash/build counter

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60b275f65..7725b8116 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -545,8 +545,8 @@ function(fw_add_variant variant_name)
       BYPRODUCTS ${LANG_HEX}
       COMMAND ${CMAKE_COMMAND} -E create_hardlink ${FW_LANG_FINAL}.hex ${LANG_DEBUG_HEX}
       BYPRODUCTS ${LANG_DEBUG_HEX}
-      COMMAND ${CMAKE_COMMAND} -E create_hardlink ${FW_LANG_FINAL}.hex ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_DEBUG_SUFFIX}_MULTILANG.hex
-      BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_DEBUG_SUFFIX}_MULTILANG.hex
+      COMMAND ${CMAKE_COMMAND} -E create_hardlink ${FW_LANG_FINAL}.hex ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_SUFFIX}_MULTILANG.hex
+      BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${hex_variant_name}_${FN_VERSION_SUFFIX}_MULTILANG.hex
       DEPENDS ${FW_LANG_PATCH}.hex ${LANG_CATHEX}
       COMMENT "Generating final ${FW_LANG_FINAL}.hex"
       )
@@ -592,7 +592,7 @@ function(fw_add_variant variant_name)
       POST_BUILD
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMAND ${CMAKE_COMMAND} -E make_directory "release"
-      COMMAND ${CMAKE_COMMAND} -E tar "cfv" "release/${variant_name}_${FN_VERSION_SUFFIX}.zip" --format=zip ${variant_name}_${FN_VERSION_DEBUG_SUFFIX}_en*.hex
+      COMMAND ${CMAKE_COMMAND} -E tar "cfv" "release/${variant_name}_${FN_VERSION_SUFFIX}.zip" --format=zip ${variant_name}_${FN_VERSION_SUFFIX}_en*.hex
       BYPRODUCTS "${CMAKE_BINARY_DIR}/release/${variant_name}_${FN_VERSION_SUFFIX}.zip"
       )
     add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages")

From 84259de7659523526cb79d7892427e887927b4d1 Mon Sep 17 00:00:00 2001
From: vintagepc <53943260+vintagepc@users.noreply.github.com>
Date: Mon, 11 Mar 2024 08:31:19 -0400
Subject: [PATCH 3/7] Update build.yml

Fix bug in run specifiers
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9cab9858d..89d710d29 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,11 +4,11 @@ on:
   pull_request:
     branches:
     - '*'
-    tags:
-    - 'v*'
   push:
     branches: [ MK3, MK3_* ]
-
+    tags:
+    - 'v*'
+    
 env:
   GH_ANNOTATIONS: 1
 

From 50ba83219f878ed655e83fbc60aded7189aa5694 Mon Sep 17 00:00:00 2001
From: VintagePC <53943260+vintagepc@users.noreply.github.com>
Date: Mon, 11 Mar 2024 19:02:24 -0400
Subject: [PATCH 4/7] Try fixing paths

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89d710d29..d3690f6f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,8 +75,8 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         draft: true
         files: |
-          "build/release/*.hex"
-          "build/release/*.zip"
+          "$GITHUB_WORKSPACE/build/release/*.hex"
+          "$GITHUB_WORKSPACE/build/release/*.zip"
 
   check-lang:
     runs-on: ubuntu-latest

From 2ad76e225bc93aa189bf5a291f21b24eada33af8 Mon Sep 17 00:00:00 2001
From: vintagepc <53943260+vintagepc@users.noreply.github.com>
Date: Tue, 12 Mar 2024 07:40:34 -0400
Subject: [PATCH 5/7] Update build.yml

Use ${{ github.workspace }} instead
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d3690f6f9..fdaef92f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,8 +75,8 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         draft: true
         files: |
-          "$GITHUB_WORKSPACE/build/release/*.hex"
-          "$GITHUB_WORKSPACE/build/release/*.zip"
+          "${{ github.workspace }}/build/release/*.hex"
+          "${{ github.workspace }}/build/release/*.zip"
 
   check-lang:
     runs-on: ubuntu-latest

From 18c7c8c55bc8ff03c51670d2fd60ecc3f47edd03 Mon Sep 17 00:00:00 2001
From: VintagePC <53943260+vintagepc@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:55:38 -0400
Subject: [PATCH 6/7] Quotes, perhaps

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdaef92f7..7439aa5b1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,8 +75,8 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         draft: true
         files: |
-          "${{ github.workspace }}/build/release/*.hex"
-          "${{ github.workspace }}/build/release/*.zip"
+          ${{ github.workspace }}/build/release/*.hex
+          ${{ github.workspace }}/build/release/*.zip
 
   check-lang:
     runs-on: ubuntu-latest

From 9df3846ffada24b9f4cfc76ca7b43cdc7e7cdf67 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 13 Mar 2024 16:23:51 +0100
Subject: [PATCH 7/7] Remove white space

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7439aa5b1..135794416 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
     branches: [ MK3, MK3_* ]
     tags:
     - 'v*'
-    
+
 env:
   GH_ANNOTATIONS: 1