Skip to content

Commit 2ad595f

Browse files
committed
build: Add GitHub Action workflow on macOS
1 parent 734af97 commit 2ad595f

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: macOS build
2+
3+
on: [push]
4+
5+
jobs:
6+
buildMacOS:
7+
name: macOS
8+
runs-on: macos-10.15
9+
steps:
10+
- name: Check out repository code
11+
uses: actions/checkout@v2
12+
- run: echo "QT_SHORT_VERSION=5.8" >> $GITHUB_ENV
13+
- run: echo "QT_LONG_VERSION=5.8.0" >> $GITHUB_ENV
14+
- run: echo "QT_INSTALLER_ROOT=qt-opensource-mac-x64-clang-${QT_LONG_VERSION}" >> $GITHUB_ENV
15+
- run: echo "QT_INSTALLER_FILENAME=${QT_INSTALLER_ROOT}.dmg" >> $GITHUB_ENV
16+
- run: echo "QT_PATH=$HOME/qt" >> $GITHUB_ENV
17+
- run: echo "QT_MACOS=$QT_PATH/$QT_SHORT_VERSION/clang_64" >> $GITHUB_ENV
18+
- run: echo "$QT_MACOS/bin" >> $GITHUB_PATH
19+
- run: ./build/travis/job_macos/install.sh
20+
- run: ./build/travis/job_macos/build.sh
21+
- name: Archive artifacts
22+
uses: actions/upload-artifact@v2
23+
with:
24+
name: MachinekitClient-Development-macOS-master-x64
25+
path: build.release/MachinekitClient.dmg

build/travis/job_macos/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
set -x
55

66
# do not build mac for PR
7-
if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
7+
if [ ! -z "${TRAVIS_PULL_REQUEST}" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
88
exit 0
99
fi
1010

@@ -88,7 +88,7 @@ if [ "${upload}" != "true" ]; then
8888
fi
8989
platform=x64
9090
# skip pull requests
91-
if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
91+
if [ ! -z "${TRAVIS_PULL_REQUEST}" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
9292
upload=
9393
fi
9494
fi

build/travis/job_macos/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -x
44

55
# do not build mac for PR
6-
if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
6+
if [ ! -z "${TRAVIS_PULL_REQUEST}" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
77
exit 0
88
fi
99

@@ -76,7 +76,7 @@ echo "QT_LONG_VERSION QT_LONG_VERSION"
7676
if [[ "$QMAKE_VERSION" != "${QT_LONG_VERSION}" ]]; then
7777
rm -rf $QT_PATH
7878
echo "Downloading Qt"
79-
wget -c --no-check-certificate -nv https://download.qt.io/archive/qt/${QT_SHORT_VERSION}/${QT_LONG_VERSION}/${QT_INSTALLER_FILENAME}
79+
wget -c --no-check-certificate -nv https://download.qt.io/new_archive/qt/${QT_SHORT_VERSION}/${QT_LONG_VERSION}/${QT_INSTALLER_FILENAME}
8080
hdiutil mount ${QT_INSTALLER_FILENAME}
8181
cp -rf /Volumes/${QT_INSTALLER_ROOT}/${QT_INSTALLER_ROOT}.app $HOME/${QT_INSTALLER_ROOT}.app
8282
QT_INSTALLER_EXE=$HOME/${QT_INSTALLER_ROOT}.app/Contents/MacOS/${QT_INSTALLER_ROOT}

0 commit comments

Comments
 (0)