From e181e5d4391ef739effc6698543dab9ed3a056d5 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 29 Apr 2020 21:12:36 +0200 Subject: [PATCH 1/3] install recent qt with aqtinstall on ubuntu github actions --- .github/workflows/CompileUbuntu.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 46a61aff1..1412e0ab7 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -16,9 +16,14 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + modules: qtscript xmlpatterns - name: Install dependencies run: | - sh install/linux/linux_setup_env_ubuntu.sh + sudo apt-get install -y 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 - name: Setup env variables id: envs run: | From 55aa8110ccd5e163a6cec3edd413b73a76f36b4b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 29 Apr 2020 21:41:44 +0200 Subject: [PATCH 2/3] missing lib for deployment --- .github/workflows/CompileUbuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 1412e0ab7..ee56e3d56 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install -y 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 + sudo apt-get install -y libxkbcommon-x11-0 chrpath - name: Setup env variables id: envs run: | From ac638d8fa20616b49b7505c67bb723b0ebcb46c4 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 29 Apr 2020 22:19:07 +0200 Subject: [PATCH 3/3] update CompileAndRelase, using external libs instead of system ones --- .github/workflows/CompileAndRelease.yml | 7 ++++++- .github/workflows/CompileUbuntu.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 4da0a74f4..3eb6ab014 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -46,9 +46,14 @@ jobs: auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + modules: qtscript xmlpatterns - name: Install dependencies run: | - sh install/linux/linux_setup_env_ubuntu.sh + sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev + sudo apt-get install -y libxkbcommon-x11-0 chrpath - name: Setup env variables id: envs run: | diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index ee56e3d56..1e6a65c51 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -22,7 +22,7 @@ jobs: modules: qtscript xmlpatterns - name: Install dependencies run: | - sudo apt-get install -y 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 mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev sudo apt-get install -y libxkbcommon-x11-0 chrpath - name: Setup env variables id: envs