Skip to content

Commit 28e6d72

Browse files
committed
Switch to macos
1 parent 6f40397 commit 28e6d72

File tree

1 file changed

+12
-30
lines changed

1 file changed

+12
-30
lines changed

.github/workflows/wasm.yml

+12-30
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-22.04]
14+
os: [macos-14]
1515

1616
runs-on: ${{ matrix.os }}
1717

@@ -21,19 +21,6 @@ jobs:
2121
- name: Check-out repository
2222
uses: actions/checkout@v4
2323

24-
- name: Set up screen (Linux)
25-
if: runner.os == 'Linux'
26-
run: |
27-
sudo apt-get install libxkbcommon-x11-0
28-
sudo apt-get install libxcb-icccm4
29-
sudo apt-get install libxcb-image0
30-
sudo apt-get install libxcb-keysyms1
31-
sudo apt-get install libxcb-randr0
32-
sudo apt-get install libxcb-render-util0
33-
sudo apt-get install libxcb-xfixes0
34-
sudo apt-get install libxcb-shape0
35-
sudo apt-get install libxcb-cursor0
36-
3724
- name: Install emsdk
3825
if: False
3926
shell: bash
@@ -47,19 +34,14 @@ jobs:
4734
- name: Install Qt for WebAssembly
4835
shell: bash
4936
run: |
50-
curl -L -O https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run
51-
ls -l
52-
chmod u+x qt-unified-linux-x64-online.run
53-
# curl -L -O https://download.qt.io/official_releases/online_installers/qt-unified-linux-arm64-online.run
54-
# ./qt-unified-linux-arm64-online.run \
55-
# --root /home/runner/Qt \
56-
# --accept-licenses \
57-
# --accept-obligations \
58-
# --default-answer \
59-
# --confirm-command \
60-
# install qt.qt6.672.wasm_singlethread qt.qt6.672.qt5compat
61-
62-
- name: Install Qt for WebAssembly
63-
shell: bash
64-
run: |
65-
./qt-unified-linux-x64-online.run
37+
curl -L -O https://download.qt.io/official_releases/online_installers/qt-unified-mac-x64-online.dmg
38+
chmod u+x qt-unified-mac-x64-online.dmg
39+
hdiutil attach qt-unified-mac-x64-online.dmg
40+
/Volumes/qt-online-installer-macOS-x64-4.8.0/qt-online-installer-macOS-x64-4.8.0.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.0 \
41+
--root ~/Qt \
42+
--accept-licenses \
43+
--accept-obligations \
44+
--default-answer \
45+
--confirm-command \
46+
install qt.qt6.672.wasm_singlethread qt.qt6.672.qt5compat
47+
hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.0

0 commit comments

Comments
 (0)