File tree Expand file tree Collapse file tree 4 files changed +35
-9
lines changed Expand file tree Collapse file tree 4 files changed +35
-9
lines changed Original file line number Diff line number Diff line change 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 : echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
20+ - run : ./build/travis/job_macos/install.sh
21+ - run : ./build/travis/job_macos/build.sh
22+ - name : Archive artifacts
23+ uses : actions/upload-artifact@v2
24+ with :
25+ name : MachinekitClient-Development-macOS-master-x64
26+ path : MachinekitClient_Development-*-x64.dmg
Original file line number Diff line number Diff line change 99 # - env: "JOB=AppImage_armhf"
1010 # - env: "JOB=Android_armv7"
1111 - env : " JOB=MacOSX"
12- include :
12+ exclude :
1313 # 1st parallel build job - debug build and tests
1414 - env : " JOB=Test_x64"
1515 addons :
Original file line number Diff line number Diff line change 44set -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
99fi
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
9494fi
@@ -102,15 +102,15 @@ if [ "${upload}" ]; then
102102 target=" QtQuickVcp_Development"
103103 fi
104104 mv build.release/QtQuickVcp.tar.gz ${target} -${version} -MacOSX-${platform} .tar.gz
105- ./build/travis/job_macos/bintray_lib.sh ${target} -${version} * .tar.gz
105+ # ./build/travis/job_macos/bintray_lib.sh ${target}-${version}*.tar.gz
106106
107107 if [ $release -eq 1 ]; then
108108 target=" MachinekitClient"
109109 else
110110 target=" MachinekitClient_Development"
111111 fi
112112 mv build.release/MachinekitClient.dmg ${target} -${version} -${platform} .dmg
113- ./build/travis/job_macos/bintray_app.sh ${target} * .dmg
113+ # ./build/travis/job_macos/bintray_app.sh ${target}*.dmg
114114else
115115 echo " On branch '$branch ' so dmg will not be uploaded." >&2
116116fi
Original file line number Diff line number Diff line change 33set -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
88fi
99
2121
2222brew update
2323brew install libtool automake autoconf pkg-config bash coreutils
24- brew install gnu-sed --with-default-names
24+ brew install gnu-sed
2525
2626# install zeromq
2727git clone https://github.com/zeromq/zeromq4-x.git
2828cd zeromq4-x
2929git checkout v4.0.8
3030sh autogen.sh
31- ./configure --disable-static --enable-shared --prefix=/opt/local CC=clang CXX=clang++ CFLAGS=" -arch x86_64" CXXFLAGS=" -std=c++11 -stdlib=libstdc ++ -O3 -arch x86_64" LDFLAGS=" -stdlib=libstdc ++"
31+ ./configure --disable-static --enable-shared --prefix=/opt/local CC=clang CXX=clang CFLAGS=" -arch x86_64" CXXFLAGS=" -std=c++11 -stdlib=libc ++ -O3 -arch x86_64" LDFLAGS=" -stdlib=libc ++"
3232make
3333sudo make install
3434cd ..
@@ -76,7 +76,7 @@ echo "QT_LONG_VERSION QT_LONG_VERSION"
7676if [[ " $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}
You can’t perform that action at this time.
0 commit comments