From 392bb7ab341ac8ce800b62150f8384ec2b44f71b Mon Sep 17 00:00:00 2001 From: Dag Heyman Date: Tue, 28 Jan 2020 08:28:58 +0100 Subject: [PATCH] actions: bump dependencies on macOS --- .github/workflows/macOS.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 92303fcd..2e9d2285 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build: - runs-on: macOS-10.14 + runs-on: macos-latest steps: - uses: actions/checkout@v1 @@ -18,20 +18,20 @@ jobs: - name: Build custom Python as a framework run: | - wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz - tar -xzvf Python-3.7.4.tgz - cd Python-3.7.4 + wget https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tgz + tar -xzvf Python-3.8.1.tgz + cd Python-3.8.1 ./configure CPPFLAGS="-I$(brew --prefix openssl@1.1)/include" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib" MACOSX_DEPLOYMENT_TARGET=10.13 CC=clang --enable-framework --with-openssl=$(brew --prefix openssl@1.1) --enable-optimizations sudo make altinstall cd .. - name: Download, build, install pyotherside QML plugin run: | - wget https://github.com/thp/pyotherside/archive/1.5.8.tar.gz - tar -xzvf 1.5.8.tar.gz - echo "DEFINES += QT_NO_DEBUG_OUTPUT" >> pyotherside-1.5.8/src/src.pro - cd pyotherside-1.5.8 - qmake PYTHON_CONFIG=/Library/Frameworks/Python.framework/Versions/3.7/bin/python3.7m-config + wget https://github.com/thp/pyotherside/archive/1.5.9.tar.gz + tar -xzvf 1.5.9.tar.gz + echo "DEFINES += QT_NO_DEBUG_OUTPUT" >> pyotherside-1.5.9/src/src.pro + cd pyotherside-1.5.9 + qmake PYTHON_CONFIG=/Library/Frameworks/Python.framework/Versions/3.8/bin/python3.8m-config make sudo make install cd .. @@ -58,19 +58,19 @@ jobs: - name: Move python dependencies to site-packages (required by codesign) run: | - rsync -a yubioath-desktop.app/Contents/MacOS/pymodules/* yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/ + rsync -a yubioath-desktop.app/Contents/MacOS/pymodules/* yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.8/lib/python3.8/site-packages/ rm -rf yubioath-desktop.app/Contents/MacOS/pymodules - name: Point pyotherside to relative Python run: | - sudo install_name_tool -change /Library/Frameworks/Python.framework/Versions/3.7/Python @executable_path/../Frameworks/Python.framework/Versions/3.7/Python yubioath-desktop.app/Contents/PlugIns/quick/libpyothersideplugin.dylib + sudo install_name_tool -change /Library/Frameworks/Python.framework/Versions/3.8/Python @executable_path/../Frameworks/Python.framework/Versions/3.8/Python yubioath-desktop.app/Contents/PlugIns/quick/libpyothersideplugin.dylib - name: Point custom Python share objects to relative openssl (from brew) run: | - sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/lib-dynload/_ssl.cpython-37m-darwin.so - sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib @executable_path/../Frameworks/libssl.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/lib-dynload/_ssl.cpython-37m-darwin.so - sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/lib-dynload/_hashlib.cpython-37m-darwin.so - sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib @executable_path/../Frameworks/libssl.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/lib-dynload/_hashlib.cpython-37m-darwin.so + sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.8/lib/python3.8/lib-dynload/_ssl.cpython-38m-darwin.so + sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib @executable_path/../Frameworks/libssl.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.8/lib/python3.8/lib-dynload/_ssl.cpython-38m-darwin.so + sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.8/lib/python3.8/lib-dynload/_hashlib.cpython-38m-darwin.so + sudo install_name_tool -change /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib @executable_path/../Frameworks/libssl.1.1.dylib yubioath-desktop.app/Contents/Frameworks/Python.framework/Versions/3.8/lib/python3.8/lib-dynload/_hashlib.cpython-38m-darwin.so sudo install_name_tool -change /usr/local/Cellar/openssl@1.1/1.1.1d/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib yubioath-desktop.app/Contents/Frameworks/libssl.1.1.dylib - name: Point ykpers dependencies to relative dylibs