Skip to content

Commit 0038f43

Browse files
ChristopherHXChristopherHX
authored
sync scripts
1 parent 6fbd2e7 commit 0038f43

File tree

1 file changed

+41
-20
lines changed

1 file changed

+41
-20
lines changed

‎.github/workflows/main.yml‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ on:
5858
required: false
5959
jobs:
6060
build-libcxx32:
61-
runs-on: macos-13
61+
runs-on: macos-15-intel
6262
steps:
63-
- name: Select Xcode
64-
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
63+
#- name: Select Xcode
64+
# run: sudo xcode-select -switch /Applications/Xcode_14.2.app
6565
- name: Check Cache libcxx32
6666
id: libcxx32-llvm
6767
uses: ChristopherHX/check-cache@main
@@ -99,7 +99,7 @@ jobs:
9999
cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON -DPYTHON_EXECUTABLE=${{ steps.setup-py.outputs.python-path }}
100100
make -j8 cxx cxxabi
101101
build-libcxx64:
102-
runs-on: macos-13
102+
runs-on: macos-15-intel
103103
steps:
104104
- name: Check Cache libcxx64
105105
id: libcxx64-llvm
@@ -138,7 +138,7 @@ jobs:
138138
cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=${{ steps.setup-py.outputs.python-path }}
139139
make -j8 cxx cxxabi
140140
build-libcxx:
141-
runs-on: macos-13
141+
runs-on: macos-15-intel
142142
needs: [build-libcxx32,build-libcxx64]
143143
steps:
144144
- name: Check libcxx
@@ -187,7 +187,7 @@ jobs:
187187
install_name_tool -rpath @loader_path/../lib @loader_path/../Frameworks libc++.dylib
188188
install_name_tool -rpath @loader_path/../lib @loader_path/../Frameworks libc++abi.dylib
189189
buildopenssl32:
190-
runs-on: macos-13
190+
runs-on: macos-15-intel
191191
steps:
192192
- name: Check for openssl
193193
id: cache-openssl32
@@ -226,6 +226,11 @@ jobs:
226226
run: |
227227
echo MACOSX_DEPLOYMENT_TARGET=10.10.0 > $GITHUB_ENV
228228
echo SDKROOT=${{ github.workspace }}/${{ secrets.MacOSX1014sdk && 'MacOSX10.14.sdk' || '../MacOSX-SDKs/MacOSX10.13.sdk' }} >> $GITHUB_ENV
229+
- name: Prepare Legacy sdk
230+
if: steps.cache-openssl32.outputs.cache-hit != 'true'
231+
run: |
232+
cd "$SDKROOT/usr/include"
233+
ln -s "$(xcrun --sdk macosx --show-sdk-path)/usr/include/c++" c++
229234
- name: Build OpenSSL
230235
if: steps.cache-openssl32.outputs.cache-hit != 'true'
231236
run: |
@@ -236,7 +241,7 @@ jobs:
236241
make -j8
237242
sudo make install_sw -j8
238243
buildopenssl64:
239-
runs-on: macos-13
244+
runs-on: macos-15-intel
240245
steps:
241246
- name: Check for openssl
242247
id: cache-openssl64
@@ -275,7 +280,11 @@ jobs:
275280
run: |
276281
echo MACOSX_DEPLOYMENT_TARGET=10.10.0 > $GITHUB_ENV
277282
echo SDKROOT=${{ github.workspace }}/${{ secrets.MacOSX1014sdk && 'MacOSX10.14.sdk' || '../MacOSX-SDKs/MacOSX10.13.sdk' }} >> $GITHUB_ENV
278-
283+
- name: Prepare Legacy sdk
284+
if: steps.cache-openssl64.outputs.cache-hit != 'true'
285+
run: |
286+
cd "$SDKROOT/usr/include"
287+
ln -s "$(xcrun --sdk macosx --show-sdk-path)/usr/include/c++" c++
279288
- name: Build OpenSSL
280289
if: steps.cache-openssl64.outputs.cache-hit != 'true'
281290
run: |
@@ -285,7 +294,7 @@ jobs:
285294
make -j8
286295
sudo make install_sw -j8
287296
buildopenssl:
288-
runs-on: macos-13
297+
runs-on: macos-15-intel
289298
needs: [buildopenssl32, buildopenssl64]
290299
steps:
291300
- name: Check openssl
@@ -330,7 +339,7 @@ jobs:
330339
install_name_tool -id @rpath/libssl.dylib -add_rpath @loader_path/../Frameworks libssl.dylib
331340
install_name_tool -id @rpath/libcrypto.dylib -add_rpath @loader_path/../Frameworks libcrypto.dylib
332341
buildangle:
333-
runs-on: macos-13
342+
runs-on: macos-15-intel
334343
# needs: [buildangle32, buildangle64]
335344
steps:
336345
- name: Check angle
@@ -376,10 +385,10 @@ jobs:
376385
lipo -remove arm64 ./source/osx-angle-ci/artifacts/libGLESv2.dylib -output ./source/osx-angle-ci/artifacts/libGLESv2.dylib
377386
if: steps.angle.outputs.cache-hit != 'true'
378387
build-protobuf:
379-
runs-on: macos-13
388+
runs-on: macos-15-intel
380389
steps:
381-
- name: Select Xcode
382-
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
390+
#- name: Select Xcode
391+
# run: sudo xcode-select -switch /Applications/Xcode_14.2.app
383392
- uses: actions/cache/restore@v4
384393
id: cache
385394
with:
@@ -407,6 +416,11 @@ jobs:
407416
run: |
408417
echo MACOSX_DEPLOYMENT_TARGET=10.10.0 > $GITHUB_ENV
409418
echo SDKROOT=${{ github.workspace }}/${{ secrets.MacOSX1014sdk && 'MacOSX10.14.sdk' || '../MacOSX-SDKs/MacOSX10.13.sdk' }} >> $GITHUB_ENV
419+
- name: Prepare Legacy sdk
420+
if: steps.cache.outputs.cache-hit != 'true'
421+
run: |
422+
cd "$SDKROOT/usr/include"
423+
ln -s "$(xcrun --sdk macosx --show-sdk-path)/usr/include/c++" c++
410424
- name: Install brew dependencies
411425
if: steps.cache.outputs.cache-hit != 'true'
412426
run: |
@@ -440,7 +454,8 @@ jobs:
440454
mcpelauncher-manifest-ref: ${{ inputs.mcpelauncher-ref }}
441455
submodule-refs: ${{ inputs.submodule-refs }}
442456
build:
443-
runs-on: macos-13
457+
continue-on-error: true
458+
runs-on: macos-15-intel
444459
if: "!(cancelled() || failure())"
445460
needs: [build-libcxx, buildopenssl, buildangle, build-protobuf, build-m1]
446461
permissions:
@@ -478,8 +493,8 @@ jobs:
478493
env:
479494
CMAKE_OSX_ARCHITECTURES: x86_64 # Is this needed? archive member: libglfw3.a(cocoa_init.m.o) cputype (16777223) does not match previous archive members cputype (7) (all members must match)
480495
steps:
481-
- name: Select Xcode
482-
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
496+
#- name: Select Xcode
497+
# run: sudo xcode-select -switch /Applications/Xcode_14.2.app
483498
- name: Setup Vars
484499
id: setup-vars
485500
uses: actions/github-script@v7
@@ -657,17 +672,23 @@ jobs:
657672
run: |
658673
echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.target }} > $GITHUB_ENV
659674
echo SDKROOT=${{ github.workspace }}/${{ secrets.MacOSX1014sdk && 'MacOSX10.14.sdk' || '../MacOSX-SDKs/MacOSX10.13.sdk' }} >> $GITHUB_ENV
675+
- name: Prepare Legacy sdk
676+
run: |
677+
DEST="$PWD/libcxx64-build/include/c++"
678+
cd "$SDKROOT/usr/include"
679+
#ln -s "$(xcrun --sdk macosx --show-sdk-path)/usr/include/c++" c++
680+
ln -s "$DEST" c++
660681
- name: Get Source libzip
661682
run: |
662683
git clone https://github.com/nih-at/libzip libzip
663684
git -C libzip checkout v1.9.2
664685
- name: Build libzip
665686
run: |
666-
cmake libzip -B libzip-build -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF
687+
cmake libzip -B libzip-build -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF
667688
cmake --build libzip-build --parallel
668689
sudo cmake --build libzip-build --target install --parallel
669-
- name: Install python dependencies
670-
run: pip3 install jinja2 ds_store
690+
- name: Install python dependencies # This is a throw away VM
691+
run: pip3 install --break-system-packages jinja2 ds_store
671692

672693
- name: add deps to base app
673694
run: |
@@ -706,7 +727,7 @@ jobs:
706727
name: dmg-${{ matrix.target }}
707728
path: dist
708729
publish:
709-
runs-on: macos-13
730+
runs-on: macos-15-intel
710731
needs: build
711732
# Eventually extend this job to be able to run on other repositories, otherwise replace the owner and repository name in this job
712733
if: ${{ !cancelled() && inputs.publish }}

0 commit comments

Comments
 (0)