Skip to content

Commit 3e11410

Browse files
committed
Update mac-os.yml
1 parent e41b122 commit 3e11410

1 file changed

Lines changed: 5 additions & 29 deletions

File tree

.github/workflows/mac-os.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
version: ['5.15.2', '6.10.0']
99
include:
1010
- version: '5.15.2'
11-
qmake-archs: 'QMAKE_APPLE_DEVICE_ARCHS=\"x86_64\"'
12-
- arch: '6.10.0'
13-
qmake-archs: 'QMAKE_APPLE_DEVICE_ARCHS=\"x86_64 arm64\"'
11+
qmake-archs: 'x86_64'
12+
- version: '6.10.0'
13+
qmake-archs: 'x86_64 arm64'
1414
runs-on: macos-15
1515
steps:
1616
- uses: actions/checkout@v1
@@ -24,11 +24,11 @@ jobs:
2424
cache: true
2525
- name: Qmake build
2626
env:
27-
QMAKE_FLAGS: ${{ matrix.qmake-archs }}
27+
QMAKE_archs: {{ matrix.qmake-archs }}
2828
run: |
2929
export PATH=$QT_ROOT_DIR/bin/:$PATH
3030
mkdir build && cd build
31-
qmake $QMAKE_FLAGS CONFIG+=sdk_no_version_check -o Makefile ../Datacorn.pro
31+
qmake QMAKE_APPLE_DEVICE_ARCHS="${QMAKE_FLAGS}" CONFIG+=sdk_no_version_check -o Makefile ../Datacorn.pro
3232
make release -j$(nproc)
3333
- name: Setup directory with artifacts
3434
run: |
@@ -42,30 +42,6 @@ jobs:
4242
with:
4343
name: Datacorn-macos-qt${{ matrix.version }}
4444
path: Datacorn/
45-
- name: Release
46-
if: ${{ github.ref == 'refs/heads/master' }}
47-
uses: svenstaro/upload-release-action@v2
48-
with:
49-
overwrite: true
50-
asset_name: Datacorn-mingw.exe
51-
prerelease: true
52-
tag: |
53-
latest
54-
file: |
55-
Datacorn/Datacorn.exe
56-
- name: Log Failure
57-
uses: sarisia/actions-status-discord@v1
58-
if: failure()
59-
with:
60-
nodetail: true
61-
description: |
62-
[[${{ github.event.repository.name }}] ${{ github.job }} failed on ${{ github.ref }}](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
63-
title: |
64-
65-
color: 0xff0000
66-
webhook: ${{ secrets.DISCORD_WEBHOOK }}
67-
avatar_url: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
68-
username: Github
6945

7046
Notify-success:
7147
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)