Add brews de libxml2, libjpeg ... in build-macos

exelearning · Jul 12, 2022 · d63f25b · d63f25b
1 parent 0330978
commit d63f25b
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -14,26 +14,22 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: 10.14
 
     steps:
+
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install macOS build requirements
+      - name: Install brew system libraries
         run: |
-          echo "--> Xcode developer dir contents"
-          ls -n /Applications/ | grep Xcode*
+
           brew install libtiff libjpeg webp little-cms2
           brew install libxml2
-          brew install openssl
-          brew info openssl
-          brew link openssl --force
-          brew info openssl
-      - name: Install required python and pip
-        uses: gabrielfalcao/pyenv-action@v8
-        with:
-          default: 2.7.18
-          command: |
-            easy_install pip
-            pip install --upgrade pip
+
+      # For compatibility with macos <=10.14, we are using system 2.7.18 python.
+      # With this version, openssl 1.0 system libs are backwards compatible.
+      # Please look at versions previous  to 2022-07-01 if you need a different python version installed with pyenv,
+      # or a newer openssl > 1.0.
+      # We could have an action workflow for <=10.14  with system python, and a workflow for >=10.15 with custom python and openssl.
+      # At present we are using this action for all versions.
       - name: Install Python requirements
         run: |
           pip install lxml==2.2.8
@@ -51,6 +47,7 @@ jobs:
           pip install oauthlib
           pip install webassets
           pip install cssmin
+
       - name: Create disk image
         run: hdiutil create -volname exe -size 500m -layout GPTSPUD -fs 'Journaled HFS+' -type UDIF installs/osx/exe
 
@@ -64,11 +61,10 @@ jobs:
           npm install  appdmg
           which appdmg
           ls -l /usr/local/bin/appdmg
-          echo "--> bin:"
-          ls -l /usr/local/bin
           cd installs/osx
           echo "--> Creating python app and DMG image..."
           python make.py -p
+
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with: