File 1930-gh-Unify-building-of-macOS-and-iOS.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1930-gh-Unify-building-of-macOS-and-iOS.patch of Package erlang

From 6209f143e8db007c5e98b3ffc8306c27b61098ed Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 28 Jun 2022 09:05:14 +0200
Subject: [PATCH 10/34] gh: Unify building of macOS and iOS

---
 .github/scripts/build-macos.sh | 21 ++++++++++++++-------
 .github/workflows/main.yaml    | 10 +++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh
index 82b07bac7b..73c35a6a22 100755
--- a/.github/scripts/build-macos.sh
+++ b/.github/scripts/build-macos.sh
@@ -1,12 +1,19 @@
 #!/bin/sh
 
-export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)
-export ERL_TOP=`pwd`
-export RELEASE_ROOT=$ERL_TOP/release
+export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
+export ERL_TOP="$(pwd)"
 export ERLC_USE_SERVER=true
+export RELEASE_ROOT="$ERL_TOP/release"
+BUILD_DOCS=false
 
-./otp_build configure \
-  --disable-dynamic-ssl-lib
+if [ "$1" = "build_docs" ]; then
+    BUILD_DOCS=true
+    shift
+fi
+
+./otp_build configure $*
 ./otp_build boot -a
-./otp_build release -a $RELEASE_ROOT
-make release_docs DOC_TARGETS=chunks
+./otp_build release -a "$RELEASE_ROOT"
+if $BUILD_DOCS; then
+    make release_docs DOC_TARGETS=chunks
+fi
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 7bdda4c618..e24f94eec5 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -127,7 +127,7 @@ jobs:
           tar -xzf ./otp_src.tar.gz
           export PATH=$PWD/wxWidgets/release/bin:$PATH
           cd otp
-          $GITHUB_WORKSPACE/.github/scripts/build-macos.sh
+          $GITHUB_WORKSPACE/.github/scripts/build-macos.sh build_docs --disable-dynamic-ssl-lib
           tar -czf otp_macos_$(cat OTP_VERSION)_x86-64.tar.gz -C release .
 
       - name: Test Erlang
@@ -152,6 +152,7 @@ jobs:
     runs-on: macos-12
     needs: pack
     steps:
+      - uses: actions/checkout@v2
       - name: Download source archive
         uses: actions/download-artifact@v2
         with:
@@ -161,12 +162,7 @@ jobs:
         run: |
           tar -xzf ./otp_src.tar.gz
           cd otp
-          export ERL_TOP=`pwd`
-          export MAKEFLAGS="-j$(($(nproc) + 2)) -O"
-          export ERLC_USE_SERVER=true
-          ./otp_build configure --xcomp-conf=./xcomp/erl-xcomp-arm64-ios.conf --without-ssl
-          ./otp_build boot -a
-          ./otp_build release -a
+          $GITHUB_WORKSPACE/.github/scripts/build-macos.sh --xcomp-conf=./xcomp/erl-xcomp-arm64-ios.conf --without-ssl
 
       - name: Package .xcframework
         run: |
-- 
2.35.3

Places

File 1930-gh-Unify-building-of-macOS-and-iOS.patch of Package erlang

Places