add fedora 36

.github/workflows/msys2.yml

@@ -95,6 +95,6 @@ jobs:
           eval `ssh-agent -s -a /tmp/.ssh-socket`
           ssh-add - <<< "${SSH_PRIVATE_KEY}"
           cd /c/src
-          MESON_PATH=/ucrt64/bin/meson NINJA_PATH=/ucrt64/bin/ninja AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/make-pkg.sh windows10-msys windows-msys-prepare
-          MESON_PATH=/ucrt64/bin/meson NINJA_PATH=/ucrt64/bin/ninja AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/make-pkg.sh windows10-msys
-          AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/push-pkg.sh windows10-msys
+          MESON_PATH=/ucrt64/bin/meson NINJA_PATH=/ucrt64/bin/ninja AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/make-pkg.sh windows-msys windows-msys-prepare
+          MESON_PATH=/ucrt64/bin/meson NINJA_PATH=/ucrt64/bin/ninja AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/make-pkg.sh windows-msys
+          AWS_CLI_PATH=/ucrt64/bin/aws zrythm-builds/scripts/push-pkg.sh windows-msys

scripts/common.sh.in

@@ -44,7 +44,7 @@ else
 fi
 set -u
 
-distros="archlinux debian11 debian12 fedora34 fedora35 ubuntu2004 ubuntu2204 gnu-linux"
+distros="archlinux debian11 debian12 fedora35 fedora36 ubuntu2004 ubuntu2204 gnu-linux"
 linguas="en de fr it ja pt"
 sendowl_bucket_name="sendowl-bucket"
 sendowl_bucket_url="s3://$sendowl_bucket_name"
@@ -84,10 +84,10 @@ distro_to_pkg_type () {
     "fedora"*)
       echo "FEDORA"
       ;;
-    "windows10")
+    "windows")
       echo "WINDOWS"
       ;;
-    "windows10-msys")
+    "windows-msys")
       echo "WINDOWS_MSYS"
       ;;
     "osx" | "macos"*)

scripts/make-pkg.sh

@@ -65,7 +65,7 @@ if ! [ "$opt" = "" ]; then
 fi
 
 echo "fetching meson subprojects..."
-if [ "$distro" = "archlinux" ] || [ "$distro" = "windows10" ]; then
+if [ "$distro" = "archlinux" ] || [ "$distro" = "windows" ]; then
   pushd zrythm
   meson subprojects download || true
   popd
@@ -74,7 +74,7 @@ if [ "$distro" = "archlinux" ] || [ "$distro" = "windows10" ]; then
   popd
 fi
 
-if [ "$distro" = "windows10" ]; then
+if [ "$distro" = "windows" ]; then
   pushd gtk
   git checkout "3.24.18"
   meson subprojects download

scripts/push-pkg.sh

@@ -47,6 +47,7 @@ deploy_pkg () {
   else
     echo >&2 "failed: $(cat out.log)"
     echo >&2 "$(cat err.log)"
+    exit 1
   fi
   echo "done"
 }
@@ -55,7 +56,7 @@ deploy_pkg () {
 deploy_pkg "$pkg_filename" "$deploy_connection_type"
 
 # also deploy trial if tag
-if is_tag ; then
+if is_tag && [[ "$distro" != "user-manual" ]]; then
   echo "deploying trial package"
   deploy_pkg "$pkg_trial_filename" "$connection_type_server"
   #add_file_tag "packages/$distro/$pkg_trial_filename" \

scripts/send-to-sendowl.sh

@@ -68,7 +68,7 @@ create_product ()
 prefetch () {
   while \
     ! remote_pkg_exists "osx-brew-zip" "$connection_type_aws" \
-    || ! remote_pkg_exists "windows10-msys" "$connection_type_aws" \
+    || ! remote_pkg_exists "windows-msys" "$connection_type_aws" \
     || ! remote_pkg_exists "gnu-linux" "$connection_type_aws" \
     || ! remote_pkg_exists "appimage" "$connection_type_aws" \
     || ! remote_pkg_exists "flatpak" "$connection_type_aws" ; do