From a0dc64426c733cfce4e5aa78465c0d956b787c4a Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 21 May 2020 15:16:36 +0200 Subject: [PATCH] removed qtscript from actions --- .github/workflows/CompileAndRelease.yml | 6 +++--- .github/workflows/CompileMacOS.yml | 2 +- .github/workflows/CompileUbuntu.yml | 2 +- .github/workflows/CompileWindows.yml | 4 ++-- install/linux/linux_setup_env_ubuntu.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 9ddbb858d..b3f60225a 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -52,7 +52,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns - name: Install dependencies run: | sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev @@ -139,7 +139,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns - name: Setup env variables id: envs shell: bash @@ -196,7 +196,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab run: | diff --git a/.github/workflows/CompileMacOS.yml b/.github/workflows/CompileMacOS.yml index 96d153486..edf71c2e9 100755 --- a/.github/workflows/CompileMacOS.yml +++ b/.github/workflows/CompileMacOS.yml @@ -23,7 +23,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns - name: Setup env variables id: envs shell: bash diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 84865c057..eb2e05894 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -19,7 +19,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns - name: Install dependencies run: | sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index 97c2f6e9a..8801ea4a2 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -31,7 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab run: | @@ -79,7 +79,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - modules: qtscript xmlpatterns + modules: xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Setup env variables id: envs diff --git a/install/linux/linux_setup_env_ubuntu.sh b/install/linux/linux_setup_env_ubuntu.sh index b5f46712e..81db808c5 100644 --- a/install/linux/linux_setup_env_ubuntu.sh +++ b/install/linux/linux_setup_env_ubuntu.sh @@ -5,5 +5,5 @@ # Run this script if you never installed any of the MeshLab dependencies. sudo apt-get update -sudo apt-get install -y qt5-default qttools5-dev-tools qtscript5-dev libqt5xmlpatterns5-dev mesa-common-dev libglu1-mesa-dev lib3ds-dev libglew-dev libeigen3-dev libopenctm-dev libgmp-dev libqhull-dev #libmuparser-dev +sudo apt-get install -y qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev mesa-common-dev libglu1-mesa-dev lib3ds-dev libglew-dev libeigen3-dev libopenctm-dev libgmp-dev libqhull-dev #libmuparser-dev sudo apt-get install -y chrpath