Change macOS builds to use OpenSSL purely as a static lib

This commit is contained in:
Twarit Waikar
2021-10-13 00:39:23 +05:30
parent 4119ad2c74
commit a6772e0d3f
6 changed files with 26 additions and 51 deletions

View File

@@ -3,11 +3,11 @@ name: C/C++ CI
on: [push, pull_request]
jobs:
linux:
linux-x64:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: build-linux-release
- name: build-linux-release-x64
run: |
git submodule update --init --recursive
pip3 install --user scons
@@ -15,12 +15,12 @@ jobs:
ldd demo/addons/godot-git-plugin/linux/libgitapi.so
- uses: actions/upload-artifact@v2
with:
name: godot-git-plugin-linux-release-${{ github.sha }}
name: godot-git-plugin-linux-release-x64-${{ github.sha }}
if-no-files-found: error
path: |
demo/
windows:
windows-x64:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
python-version: "3.x"
architecture: "x64"
- uses: ilammy/msvc-dev-cmd@v1
- name: build-windows-release
- name: build-windows-release-x64
run: |
git submodule update --init --recursive
pip3 install --user scons
@@ -37,7 +37,7 @@ jobs:
dumpbin /dependents .\demo\addons\godot-git-plugin\win64\libgitapi.dll
- uses: actions/upload-artifact@v2
with:
name: godot-git-plugin-windows-release-${{ github.sha }}
name: godot-git-plugin-windows-release-x64-${{ github.sha }}
if-no-files-found: error
path: |
demo/
@@ -46,10 +46,10 @@ jobs:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- name: build-macos-release
- name: build-macos-release-x64
run: |
git submodule update --init --recursive
brew install scons openssl@1.1
brew install scons
scons platform=osx target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json macos_arch=x86_64 macos_ssl_path=/usr/local/opt/openssl@1.1/ use_llvm=yes -j $(sysctl -n hw.logicalcpu)
otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib
- uses: actions/upload-artifact@v2
@@ -58,20 +58,3 @@ jobs:
if-no-files-found: error
path: |
demo/
macos-arm64:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- name: build-macos-release
run: |
git submodule update --init --recursive
brew install scons openssl@1.1
scons platform=osx target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json macos_arch=arm64 macos_ssl_path=/usr/local/opt/openssl@1.1/ use_llvm=yes -j $(sysctl -n hw.logicalcpu)
otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib
- uses: actions/upload-artifact@v2
with:
name: godot-git-plugin-macos-release-arm64-${{ github.sha }}
if-no-files-found: error
path: |
demo/