From 7576825771174826c77608c33aa92ac478e6a189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?=
 <jeanmichael.celerier@gmail.com>
Date: Mon, 8 Jul 2024 14:42:46 -0400
Subject: [PATCH] [ci] Try to improve continuous build, add all files in
 release

---
 .github/workflows/embedded.yaml   | 10 ++++++++++
 .github/workflows/flatpak.yml     | 10 ++++++++++
 .github/workflows/mac-builds.yaml | 10 ++++++++++
 .github/workflows/win-builds.yaml | 11 +++++++++++
 azure-pipelines.yml               |  2 +-
 ci/jammy.deploy.sh                |  4 ++--
 ci/osx-package.deploy.sh          |  5 ++++-
 7 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/embedded.yaml b/.github/workflows/embedded.yaml
index 2dccb96dd9..bff3321fa4 100644
--- a/.github/workflows/embedded.yaml
+++ b/.github/workflows/embedded.yaml
@@ -87,6 +87,16 @@ jobs:
           generate_release_notes: false
           files: |
             *.tar.gz
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          body: ""
+          append_body: true
+          generate_release_notes: false
+          files: |
+            *.tar.gz
 #  rpi_test:
 #    name: Raspberry
 #    runs-on: ubuntu-latest
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index f5d07a1142..da466079cc 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -24,6 +24,16 @@ jobs:
       with:
         name: "Continuous"
         tag_name: "continuous"
+        body: ""
+        append_body: true
+        generate_release_notes: false
+        files: |
+          *.flatpak
+
+    - name: Release
+      uses: softprops/action-gh-release@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
         body: ""
         append_body: true
         generate_release_notes: false
diff --git a/.github/workflows/mac-builds.yaml b/.github/workflows/mac-builds.yaml
index 4ab3928139..53aac1e56e 100644
--- a/.github/workflows/mac-builds.yaml
+++ b/.github/workflows/mac-builds.yaml
@@ -113,3 +113,13 @@ jobs:
           generate_release_notes: false
           files: |
             staging/*.*
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          body: ""
+          append_body: true
+          generate_release_notes: false
+          files: |
+            staging/*.*
\ No newline at end of file
diff --git a/.github/workflows/win-builds.yaml b/.github/workflows/win-builds.yaml
index 162c255c7c..e3400647f5 100644
--- a/.github/workflows/win-builds.yaml
+++ b/.github/workflows/win-builds.yaml
@@ -59,6 +59,17 @@ jobs:
           generate_release_notes: false
           files: |
             output/*.appxbundle
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          body: ""
+          append_body: true
+          generate_release_notes: false
+          files: |
+            output/*.appxbundle
+
   mingw:
     runs-on: windows-latest
     strategy:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c03e89507..0925e7c053 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -165,7 +165,7 @@ stages:
               assets: "$(System.DefaultWorkingDirectory)/*"
               tagSource: userSpecifiedTag
               title: "Continuous build"
-              assetUploadMode: "delete"
+              assetUploadMode: "replace"
               isPreRelease: true
 
           - task: GitHubRelease@1
diff --git a/ci/jammy.deploy.sh b/ci/jammy.deploy.sh
index f989b690ab..37290bb4c7 100755
--- a/ci/jammy.deploy.sh
+++ b/ci/jammy.deploy.sh
@@ -2,5 +2,5 @@
 export TAG=$(echo "$GITHUB_REF" | sed "s/.*\///;s/^v//")
 
 find . -name '*.deb'
-mv *.deb "ossia score-$TAG-ubuntu22-amd64.deb" || true
-mv build/*.deb "ossia score-$TAG-ubuntu22-amd64.deb" || true
+mv *.deb "ossia score-$TAG-ubuntu2204-amd64.deb" || true
+mv build/*.deb "ossia score-$TAG-ubuntu2204-amd64.deb" || true
diff --git a/ci/osx-package.deploy.sh b/ci/osx-package.deploy.sh
index 217e27f87b..6c67fd05a6 100755
--- a/ci/osx-package.deploy.sh
+++ b/ci/osx-package.deploy.sh
@@ -22,6 +22,9 @@ echo " === code signing === "
 if [[ "${CI_IS_AZURE}" = "1" ]]; then
   echo "... unlock keychain "
   security unlock-keychain -p travis build.keychain
+  export PACKAGE_ARCH=Intel
+else
+  export PACKAGE_ARCH=AppleSilicon
 fi
 
 
@@ -77,5 +80,5 @@ xcrun stapler validate ./*.dmg
 [[ $? == 0 ]] || exit 1
 
 # Archive
-mv ./*.dmg "$BUILD_ARTIFACTSTAGINGDIRECTORY/ossia score-$TAG-macOS.dmg"
+mv ./*.dmg "$BUILD_ARTIFACTSTAGINGDIRECTORY/ossia score-$TAG-macOS-$PACKAGE_ARCH.dmg"
 mv "mac-sdk.zip" "$BUILD_ARTIFACTSTAGINGDIRECTORY/"