diff options
| author | Lukas Larsson <lukas@erlang.org> | 2022-06-28 09:05:14 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2022-08-29 11:43:36 +0200 |
| commit | 6209f143e8db007c5e98b3ffc8306c27b61098ed (patch) | |
| tree | c6c1204bacbab7b2bc1ff7267a78f07f75d59c79 /.github | |
| parent | 9fff925758f86c2c35590e5de55f3faf5182f74e (diff) | |
| download | erlang-6209f143e8db007c5e98b3ffc8306c27b61098ed.tar.gz | |
gh: Unify building of macOS and iOS
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/scripts/build-macos.sh | 21 | ||||
| -rw-r--r-- | .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: | |