Skip to content

Commit 2e00623

Browse files
committed
Merge branch 'main' into devel
# Conflicts: # src/meshlab
2 parents 8a22d3d + 9c30334 commit 2e00623

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.github/workflows/BuildAndTest.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
[push, pull_request]
55

66
env:
7-
QT_VERSION: 5.15.2
7+
QT_VERSION: 5.15.*
88

99
jobs:
1010
build_pymeshlab:
@@ -36,27 +36,27 @@ jobs:
3636
- name: Setup Windows MSVC
3737
uses: ilammy/msvc-dev-cmd@v1
3838
- name: Install Qt
39-
if: ${{ matrix.os != 'macos-latest' && matrix.os != 'ubuntu-22.04-arm' }}
40-
uses: jurplel/install-qt-action@v3
39+
if: ${{ matrix.os != 'macos-latest' && runner.os != 'Linux' }}
40+
uses: jurplel/install-qt-action@v4
4141
with:
4242
cache: true
4343
version: ${{ env.QT_VERSION }}
4444
- name: Install Python ${{ matrix.pyversion }}
4545
uses: actions/setup-python@v5
4646
with:
4747
python-version: ${{ matrix.pyversion }}
48-
- name: Install dependencies
49-
shell: bash
48+
- name: Install apt qt
49+
if: runner.os == 'Linux'
5050
run: |
51-
sh scripts/${{ runner.os }}/0_setup_env.sh
51+
sudo apt-get install qtbase5-dev qt5-qmake
5252
- name: Install Brew Qt
5353
if: matrix.os == 'macos-latest'
5454
run: |
5555
brew install qt@5
56-
- name: Install apt qt
57-
if: matrix.os == 'ubuntu-22.04-arm'
56+
- name: Install dependencies
57+
shell: bash
5858
run: |
59-
sudo apt-get install qtbase5-dev qt5-qmake
59+
sh scripts/${{ runner.os }}/0_setup_env.sh
6060
- name: Cache external libraries sources
6161
id: cache-ext-libs
6262
uses: actions/cache@v4

.github/workflows/CreateAndTestRelease.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
default: 'YYYY.MM'
1010

1111
env:
12-
QT_VERSION: 5.15.2
12+
QT_VERSION: 5.15.*
1313

1414
jobs:
1515
update_version:
@@ -56,27 +56,27 @@ jobs:
5656
- name: Setup Windows MSVC
5757
uses: ilammy/msvc-dev-cmd@v1
5858
- name: Install Qt
59-
if: ${{ matrix.os != 'macos-latest' && matrix.os != 'ubuntu-22.04-arm' }}
60-
uses: jurplel/install-qt-action@v3
59+
if: ${{ matrix.os != 'macos-latest' && runner.os != 'Linux' }}
60+
uses: jurplel/install-qt-action@v4
6161
with:
6262
cache: true
6363
version: ${{ env.QT_VERSION }}
6464
- name: Install apt qt
65-
if: matrix.os == 'ubuntu-22.04-arm'
65+
if: runner.os == 'Linux'
6666
run: |
6767
sudo apt-get install qtbase5-dev qt5-qmake
6868
- name: Install Python ${{ matrix.pyversion }}
6969
uses: actions/setup-python@v5
7070
with:
7171
python-version: ${{ matrix.pyversion }}
72-
- name: Install dependencies
73-
shell: bash
74-
run: |
75-
sh scripts/${{ runner.os }}/0_setup_env.sh
7672
- name: Install Brew Qt
7773
if: matrix.os == 'macos-latest'
7874
run: |
7975
brew install qt@5
76+
- name: Install dependencies
77+
shell: bash
78+
run: |
79+
sh scripts/${{ runner.os }}/0_setup_env.sh
8080
- name: Cache external libraries sources
8181
id: cache-ext-libs
8282
uses: actions/cache@v4

0 commit comments

Comments
 (0)