kybos · kybos · Oct 19, 2020 · Oct 19, 2020 · Oct 19, 2020 · Oct 19, 2020
diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml
@@ -2,34 +2,38 @@ name: Create AppImage latest
 
 #on: workflow_dispatch
 on: 
-  schedule:
-    - cron: '0 7 * * MON'
+  push:
+#    branches:
+#      - master
+#on: 
+#  schedule:
+#    - cron: '0 7 * * MON'
 
 env: 
   BUILD_TYPE: Release
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Install Deps
       run: |
-        sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic
+        sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial
         sudo apt-get update
         sudo apt-get install libsndfile1-dev libsamplerate0-dev libjack-jackd2-dev ladspa-sdk liblo-dev dssi-dev \
           lv2-dev libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev librtaudio-dev \
           libinstpatch-dev liblilv-dev liblrdf0-dev liblash-compat-dev librubberband-dev python3-dev
         # sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev
         sudo apt-get install mesa-common-dev libglu1-mesa-dev
-        sudo apt-get install qt514base qt514tools qt514svg
+        sudo apt-get install qt515base qt515tools qt515svg
 
     - name: Check Qt Installation
       run: |
-        #cat /opt/qt513/bin/qt514-env.sh
-        QT_BASE_DIR=/opt/qt514
+        #cat /opt/qt515/bin/qt515-env.sh
+        QT_BASE_DIR=/opt/qt515
         export QTDIR=$QT_BASE_DIR
         export PATH=$QT_BASE_DIR/bin:$PATH
         export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
@@ -48,7 +52,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         REPO_PATH=$GITHUB_WORKSPACE/muse3     
-        cmake $REPO_PATH -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr #-DMODULES_BUILD_STATIC:BOOL=ON
+        cmake $REPO_PATH -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr #-DCMAKE_AUTOUIC=ON
     - name: Build
       working-directory: ${{runner.workspace}}/build
       run: cmake --build . --config $BUILD_TYPE -j3
@@ -64,18 +68,21 @@ jobs:
         wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
         chmod +x linuxdeploy*.AppImage
 
-        # wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-        # chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-
-        LIB_MODULES=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/modules
-        LIB_PLUGINS=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/plugins
-        LIB_SYNTHI=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/synthi
-        LIB_CONV=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/converters
+        export MUSEDIR=$(basename -a ${{runner.workspace}}/build/appdir/usr/lib/muse-*)      
+        LIB_MODULES=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/modules
+        LIB_PLUGINS=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/plugins
+        LIB_SYNTHI=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/synthi
+        LIB_CONV=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/converters
         export LD_LIBRARY_PATH=$LIB_MODULES:$LIB_PLUGINS:$LIB_SYNTHI:$LIB_CONV:$LD_LIBRARY_PATH
-        # ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage -bundle-non-qt-libs -verbose=2
-        #./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage
+
         ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt
 
+        mkdir -p appdir/usr/optional/
+        wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./appdir/usr/optional/exec.so
+        cd appdir
+        rm AppRun.wrapped
+        wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -O AppRun.wrapped ; chmod a+x AppRun.wrapped
+
         echo '#! /usr/bin/env bash' > appdir/AppRun
         echo 'set -e' >> appdir/AppRun
         echo 'this_dir=$(readlink -f $(dirname "$0"))' >> appdir/AppRun
@@ -91,5 +98,5 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "latest"
         prerelease: true
-        title: "Current master (experimental)"
+        title: "Current master (AppImage)"
         files: ${{runner.workspace}}/build/MusE*.AppImage
diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml
@@ -1,17 +1,16 @@
 name: Create AppImage for release
 
-on: workflow_dispatch
-#on: push
-#  push:
-#    tags:
-#      - 'muse_*'
-#    - 'muse_*'
-#    - '!muse_*_pre*'
-
+#on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag'
+        required: true
 env: 
   BUILD_TYPE: Release
-  TAG: muse_3_2_0_pre1
-  PRERELEASE: true
+#  TAG: muse_3_2_0_pre1
+  TAG: ${{ github.event.inputs.tag }}
 
 jobs:
   build:
@@ -55,7 +54,8 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         REPO_PATH=$GITHUB_WORKSPACE/muse3     
-        cmake $REPO_PATH -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr #-DMODULES_BUILD_STATIC:BOOL=ON
+        cmake $REPO_PATH -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr
+
     - name: Build
       working-directory: ${{runner.workspace}}/build
       run: cmake --build . --config $BUILD_TYPE -j3
@@ -65,19 +65,20 @@ jobs:
       run: |
         make DESTDIR=appdir install ; find appdir/
 
-        find appdir \( -name "moc_*" -or -name "*.o" -or -name "qrc_*" -or -name "Makefile*" -or -name "*.a" \) -exec rm {} \;
         wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
         wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
         wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
         chmod +x linuxdeploy*.AppImage
 
         # wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
         # chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-
-        LIB_MODULES=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/modules
-        LIB_PLUGINS=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/plugins
-        LIB_SYNTHI=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/synthi
-        LIB_CONV=${{runner.workspace}}/build/appdir/usr/lib/muse-3.1/converters
+
+        export MUSEDIR=$(basename -a ${{runner.workspace}}/build/appdir/usr/lib/muse-*)
+
+        LIB_MODULES=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/modules
+        LIB_PLUGINS=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/plugins
+        LIB_SYNTHI=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/synthi
+        LIB_CONV=${{runner.workspace}}/build/appdir/usr/lib/$MUSEDIR/converters
         export LD_LIBRARY_PATH=$LIB_MODULES:$LIB_PLUGINS:$LIB_SYNTHI:$LIB_CONV:$LD_LIBRARY_PATH
         # ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage -bundle-non-qt-libs -verbose=2
         #./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage
@@ -91,13 +92,9 @@ jobs:
 
         export VERSION=${{ env.TAG }}
         ./linuxdeploy-plugin-appimage-x86_64.AppImage --appdir appdir 
-        
-    - name: Upload AppImage      
-      uses: "marvinpinto/action-automatic-releases@latest"
+
+    - name: Upload AppImage  
+      uses: actions/upload-artifact@v2
       with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: ${{ env.TAG }} 
-        title: ${{ env.TAG }}
-        draft: true
-        prerelease: ${{ env.PRERELEASE }}
-        files: ${{runner.workspace}}/build/MusE*.AppImage
+        name: AppImage release
+        path: ${{runner.workspace}}/build/MusE-*-x86_64.AppImage