From eef47e97b084148009f8360d90193eac21dfc50a Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 11:02:46 +0200 Subject: [PATCH 01/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 21954c16f..3ea176f95 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -1,9 +1,11 @@ name: Create AppImage latest #on: workflow_dispatch -on: - schedule: - - cron: '0 7 * * MON' +#on: pull_request +on: push +#on: +# schedule: +# - cron: '0 7 * * MON' env: BUILD_TYPE: Release @@ -13,7 +15,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - name: Install Deps run: | @@ -85,11 +87,17 @@ jobs: export VERSION=master #linuxdeployqt uses this for naming the file ./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: "latest" - prerelease: true - title: "Current master (experimental)" - files: ${{runner.workspace}}/build/MusE*.AppImage + name: AppImage current master + path: ${{runner.workspace}}/build/MMusE-master-x86_64.AppImage + + #uses: "marvinpinto/action-automatic-releases@latest" + #with: + # repo_token: "${{ secrets.GITHUB_TOKEN }}" + # automatic_release_tag: "latest" + # prerelease: true + # title: "Current master (experimental)" + # files: ${{runner.workspace}}/build/MusE*.AppImage From d59b8c18ea72bcf774c94f3fa4d29365dfe9ec47 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 11:06:09 +0200 Subject: [PATCH 02/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 3ea176f95..24eea1822 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -92,7 +92,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: AppImage current master - path: ${{runner.workspace}}/build/MMusE-master-x86_64.AppImage + path: ${{runner.workspace}}/build/MusE-master-x86_64.AppImage #uses: "marvinpinto/action-automatic-releases@latest" #with: From 8e68eab26bba7c126f0619893e6ac4649620c339 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 11:12:44 +0200 Subject: [PATCH 03/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 24eea1822..a7e0b5854 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -87,17 +87,9 @@ jobs: export VERSION=master #linuxdeployqt uses this for naming the file ./linuxdeploy-plugin-appimage-x86_64.AppImage --appdir appdir - - name: Upload AppImage - + - name: Upload AppImage - uses: actions/upload-artifact@v2 with: name: AppImage current master path: ${{runner.workspace}}/build/MusE-master-x86_64.AppImage - - #uses: "marvinpinto/action-automatic-releases@latest" - #with: - # repo_token: "${{ secrets.GITHUB_TOKEN }}" - # automatic_release_tag: "latest" - # prerelease: true - # title: "Current master (experimental)" - # files: ${{runner.workspace}}/build/MusE*.AppImage + From dacb383a70a4a948409c39f7e71b8a4625ec7ce9 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 11:16:23 +0200 Subject: [PATCH 04/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index a7e0b5854..a331aabbc 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -1,11 +1,8 @@ name: Create AppImage latest +on: push #on: workflow_dispatch #on: pull_request -on: push -#on: -# schedule: -# - cron: '0 7 * * MON' env: BUILD_TYPE: Release @@ -92,4 +89,3 @@ jobs: with: name: AppImage current master path: ${{runner.workspace}}/build/MusE-master-x86_64.AppImage - From 28820fb886480816cb7ad5f87ec4d4231888dda8 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 11:19:09 +0200 Subject: [PATCH 05/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index a331aabbc..b133a3915 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -85,7 +85,7 @@ jobs: ./linuxdeploy-plugin-appimage-x86_64.AppImage --appdir appdir - name: Upload AppImage - - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2 with: name: AppImage current master path: ${{runner.workspace}}/build/MusE-master-x86_64.AppImage From 03f3d718e175f77fb366d63276d6db63fc9b9268 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 12:17:28 +0200 Subject: [PATCH 06/20] Update appimage_release.yml --- .github/workflows/appimage_release.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml index 696f22d28..e13897129 100644 --- a/.github/workflows/appimage_release.yml +++ b/.github/workflows/appimage_release.yml @@ -1,6 +1,12 @@ name: Create AppImage for release -on: workflow_dispatch +#on: workflow_dispatch +on: + workflow_dispatch: + inputs: + tag: + description: 'Release tag' + required: true #on: push # push: # tags: @@ -10,7 +16,8 @@ on: workflow_dispatch env: BUILD_TYPE: Release - TAG: muse_3_2_0_pre1 +# TAG: muse_3_2_0_pre1 + TAG: ${{ github.event.inputs.tag }} PRERELEASE: true jobs: @@ -91,13 +98,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 current master + path: ${{runner.workspace}}/build/MusE-*-x86_64.AppImage From 479267eb9c073876d9694251491b741edf3a1e26 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 12:26:05 +0200 Subject: [PATCH 07/20] Update appimage_release.yml --- .github/workflows/appimage_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml index e13897129..511c1fa6f 100644 --- a/.github/workflows/appimage_release.yml +++ b/.github/workflows/appimage_release.yml @@ -18,7 +18,7 @@ env: BUILD_TYPE: Release # TAG: muse_3_2_0_pre1 TAG: ${{ github.event.inputs.tag }} - PRERELEASE: true +# PRERELEASE: true jobs: build: From 41db6927e886f3de83c1f86245f369c1b4773e9c Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 19 Oct 2020 12:29:03 +0200 Subject: [PATCH 08/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index b133a3915..0b5384ca9 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -1,8 +1,8 @@ name: Create AppImage latest -on: push +#on: push #on: workflow_dispatch -#on: pull_request +on: pull_request env: BUILD_TYPE: Release From 88ff7cf7a274901717d03692ee45ede0db212387 Mon Sep 17 00:00:00 2001 From: kybos Date: Tue, 20 Oct 2020 20:16:09 +0200 Subject: [PATCH 09/20] Update appimage_release.yml --- .github/workflows/appimage_release.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml index 511c1fa6f..5079d9111 100644 --- a/.github/workflows/appimage_release.yml +++ b/.github/workflows/appimage_release.yml @@ -7,18 +7,10 @@ on: tag: description: 'Release tag' required: true -#on: push -# push: -# tags: -# - 'muse_*' -# - 'muse_*' -# - '!muse_*_pre*' - env: BUILD_TYPE: Release # TAG: muse_3_2_0_pre1 TAG: ${{ github.event.inputs.tag }} -# PRERELEASE: true jobs: build: @@ -62,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 @@ -72,7 +65,6 @@ 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 @@ -80,11 +72,13 @@ jobs: # 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 From eb7b3794d4839c77d8e17f18ce6caf3c8f55644d Mon Sep 17 00:00:00 2001 From: kybos Date: Tue, 20 Oct 2020 21:30:30 +0200 Subject: [PATCH 10/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 0b5384ca9..227c29ee6 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -1,8 +1,6 @@ name: Create AppImage latest -#on: push -#on: workflow_dispatch -on: pull_request +on: push env: BUILD_TYPE: Release @@ -27,7 +25,8 @@ jobs: - name: Check Qt Installation run: | - #cat /opt/qt513/bin/qt514-env.sh + cat /opt/qt514/bin/qt514-env.sh + ./opt/qt514/bin/qt514-env.sh QT_BASE_DIR=/opt/qt514 export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH @@ -48,6 +47,7 @@ jobs: run: | REPO_PATH=$GITHUB_WORKSPACE/muse3 cmake $REPO_PATH -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr #-DMODULES_BUILD_STATIC:BOOL=ON + - name: Build working-directory: ${{runner.workspace}}/build run: cmake --build . --config $BUILD_TYPE -j3 @@ -63,16 +63,13 @@ 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 echo '#! /usr/bin/env bash' > appdir/AppRun From bbdbfd2a9a979d4d92cfdd65936b51f7ca15ecbf Mon Sep 17 00:00:00 2001 From: kybos Date: Tue, 20 Oct 2020 21:47:44 +0200 Subject: [PATCH 11/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 227c29ee6..369311d7c 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -25,8 +25,7 @@ jobs: - name: Check Qt Installation run: | - cat /opt/qt514/bin/qt514-env.sh - ./opt/qt514/bin/qt514-env.sh + #cat /opt/qt514/bin/qt514-env.sh QT_BASE_DIR=/opt/qt514 export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH From 663fbaea169b46b53c6f6e763ab1b951f35fc4d2 Mon Sep 17 00:00:00 2001 From: kybos Date: Wed, 21 Oct 2020 10:59:04 +0200 Subject: [PATCH 12/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 38 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 369311d7c..9cfb3b430 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -14,30 +14,36 @@ jobs: - name: Install Deps run: | - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic - sudo apt-get update + # sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic + # 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 qt514base qt514tools qt514svg - - name: Check Qt Installation - run: | - #cat /opt/qt514/bin/qt514-env.sh - QT_BASE_DIR=/opt/qt514 - 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 - export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH + # - name: Check Qt Installation + # run: | + # #cat /opt/qt514/bin/qt514-env.sh + # QT_BASE_DIR=/opt/qt514 + # 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 + # export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH - echo "$PATH" >> $GITHUB_PATH - echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV - echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV + # echo "$PATH" >> $GITHUB_PATH + # echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV + # echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV + # echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV + # echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + version: 5.15.1 + #cached: ${{ steps.cache-qt.outputs.cache-hit }} + - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build From 79cfad1bb3e827a1f5d2e8eb174a2181cac9abbc Mon Sep 17 00:00:00 2001 From: kybos Date: Wed, 21 Oct 2020 11:43:41 +0200 Subject: [PATCH 13/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 38 +++++++++++---------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 9cfb3b430..369311d7c 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -14,36 +14,30 @@ jobs: - name: Install Deps run: | - # sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic - # sudo apt-get update + sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic + 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 qt514base qt514tools qt514svg - # - name: Check Qt Installation - # run: | - # #cat /opt/qt514/bin/qt514-env.sh - # QT_BASE_DIR=/opt/qt514 - # 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 - # export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH + - name: Check Qt Installation + run: | + #cat /opt/qt514/bin/qt514-env.sh + QT_BASE_DIR=/opt/qt514 + 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 + export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH - # echo "$PATH" >> $GITHUB_PATH - # echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV - # echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV - # echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV - # echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV + echo "$PATH" >> $GITHUB_PATH + echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV + echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV - - name: Install Qt - uses: jurplel/install-qt-action@v2 - with: - version: 5.15.1 - #cached: ${{ steps.cache-qt.outputs.cache-hit }} - - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build From 2aaa89721ba6385b70b3b7c8e605f4a562d106c5 Mon Sep 17 00:00:00 2001 From: kybos Date: Wed, 21 Oct 2020 11:47:11 +0200 Subject: [PATCH 14/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 37 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 369311d7c..e4f2a54bc 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -14,30 +14,43 @@ jobs: - name: Install Deps run: | - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic - sudo apt-get update + # sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic + # 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 qt514base qt514tools qt514svg - - name: Check Qt Installation - run: | - #cat /opt/qt514/bin/qt514-env.sh - QT_BASE_DIR=/opt/qt514 - 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 - export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH + # - name: Check Qt Installation + # run: | + # #cat /opt/qt514/bin/qt514-env.sh + # QT_BASE_DIR=/opt/qt514 + # 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 + # export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH echo "$PATH" >> $GITHUB_PATH echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV - + + - name: Cache Qt + id: cache-qt + uses: actions/cache@v1 + with: + path: ../Qt + key: ${{ runner.os }}-QtCache + + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + version: 5.15.1 + cached: ${{ steps.cache-qt.outputs.cache-hit }} + - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build From 05448c4ef140d155d5363632ff1fe1e50de8e1dd Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 16 Nov 2020 09:58:03 +0100 Subject: [PATCH 15/20] Update appimage_release.yml --- .github/workflows/appimage_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml index 5079d9111..5b692d167 100644 --- a/.github/workflows/appimage_release.yml +++ b/.github/workflows/appimage_release.yml @@ -96,5 +96,5 @@ jobs: - name: Upload AppImage uses: actions/upload-artifact@v2 with: - name: AppImage current master + name: AppImage release path: ${{runner.workspace}}/build/MusE-*-x86_64.AppImage From ccc2cd5533197609e34e48c30629c6766eccb78f Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 21 Dec 2020 16:07:55 +0100 Subject: [PATCH 16/20] Test 16.04 --- .github/workflows/appimage_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index e4f2a54bc..542aa6cdf 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -7,7 +7,7 @@ env: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v2 From 9893ec0a9ef2650504ae474597feeafb3b38b13c Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 21 Dec 2020 16:14:13 +0100 Subject: [PATCH 17/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 62 +++++++++++++-------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 542aa6cdf..42d3936d7 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -1,6 +1,13 @@ name: Create AppImage latest -on: push +#on: workflow_dispatch +on: + push: + branches: + - master +#on: +# schedule: +# - cron: '0 7 * * MON' env: BUILD_TYPE: Release @@ -10,47 +17,34 @@ jobs: runs-on: ubuntu-16.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - name: Install Deps run: | - # sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic - # sudo apt-get update + sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic + 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 qt514base qt514tools qt514svg - # - name: Check Qt Installation - # run: | - # #cat /opt/qt514/bin/qt514-env.sh - # QT_BASE_DIR=/opt/qt514 - # 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 - # export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH + - name: Check Qt Installation + run: | + #cat /opt/qt514/bin/qt514-env.sh + QT_BASE_DIR=/opt/qt514 + 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 + export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH echo "$PATH" >> $GITHUB_PATH echo "QT_BASE_DIR=$QT_BASE_DIR" >> $GITHUB_ENV echo "QTDIR=$QT_BASE_DIR" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV - - - name: Cache Qt - id: cache-qt - uses: actions/cache@v1 - with: - path: ../Qt - key: ${{ runner.os }}-QtCache - - - name: Install Qt - uses: jurplel/install-qt-action@v2 - with: - version: 5.15.1 - cached: ${{ steps.cache-qt.outputs.cache-hit }} - + - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build @@ -58,8 +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 @@ -93,8 +86,11 @@ jobs: export VERSION=master #linuxdeployqt uses this for naming the file ./linuxdeploy-plugin-appimage-x86_64.AppImage --appdir appdir - - name: Upload AppImage - uses: actions/upload-artifact@v2 + - name: Upload AppImage + uses: "marvinpinto/action-automatic-releases@latest" with: - name: AppImage current master - path: ${{runner.workspace}}/build/MusE-master-x86_64.AppImage + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Current master (AppImage)" + files: ${{runner.workspace}}/build/MusE*.AppImage From 769feeae15d9d09bf9ddd02416b497a978fb6dd8 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 21 Dec 2020 16:15:13 +0100 Subject: [PATCH 18/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index 42d3936d7..ba867b95d 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -3,8 +3,8 @@ name: Create AppImage latest #on: workflow_dispatch on: push: - branches: - - master +# branches: +# - master #on: # schedule: # - cron: '0 7 * * MON' From 202d0d87253b52baa422f41807c453ee87ef06a0 Mon Sep 17 00:00:00 2001 From: kybos Date: Mon, 21 Dec 2020 16:21:05 +0100 Subject: [PATCH 19/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index ba867b95d..cd2a6f3d6 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -21,19 +21,19 @@ jobs: - 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/qt514/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 From d329f813cbb8dec08a57bb01394e553c56bd8914 Mon Sep 17 00:00:00 2001 From: kybos Date: Tue, 6 Jul 2021 15:39:08 +0200 Subject: [PATCH 20/20] Update appimage_latest.yml --- .github/workflows/appimage_latest.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml index cd2a6f3d6..5da1b1c86 100644 --- a/.github/workflows/appimage_latest.yml +++ b/.github/workflows/appimage_latest.yml @@ -77,6 +77,12 @@ jobs: ./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