Skip to content

Commit

Permalink
chore: Update CI for .Net Framework (#89)
Browse files Browse the repository at this point in the history
The .Net framework is only supported
in windows.

Also, update the SharedMakefile
to consolidate passing the framework.
seebees authored Oct 11, 2023
1 parent cd6b0aa commit 554ee57
Showing 2 changed files with 12 additions and 16 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/library_net_tests.yml
Original file line number Diff line number Diff line change
@@ -73,29 +73,22 @@ jobs:
CORES=$(node -e 'console.log(os.cpus().length)')
make transpile_net CORES=$CORES
# .NET Framework is only supported in Windows
- name: Test ${{ matrix.library }} .NET Framework net48
if: matrix.os == 'windows-latest'
working-directory: ./${{ matrix.library }}
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
DYLD_LIBRARY_PATH="/usr/local/opt/openssl@1.1/lib"
dotnet run \
--project runtimes/net/tests/ \
--framework net48
else
dotnet run \
--project runtimes/net/tests/ \
--framework net48
fi
make test_net FRAMEWORK=net48
- name: Test ${{ matrix.library }}
- name: Test ${{ matrix.library }} .NET net6.0
working-directory: ./${{ matrix.library }}
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
make test_net_mac_intel
make test_net_mac_intel FRAMEWORK=net6.0
else
make test_net
make test_net FRAMEWORK=net6.0
fi
- name: Test Cache Thread Safety
9 changes: 6 additions & 3 deletions SharedMakefileV2.mk
Original file line number Diff line number Diff line change
@@ -307,20 +307,23 @@ transpile_test_net: _transpile_test_all
transpile_dependencies_net: LANG=net
transpile_dependencies_net: transpile_dependencies

test_net_mac_brew: FRAMEWORK=net6.0
test_net:
dotnet run \
--project runtimes/net/tests/ \
--framework net6.0
--framework $(FRAMEWORK)

test_net_mac_brew: FRAMEWORK=net6.0
test_net_mac_intel:
DYLD_LIBRARY_PATH="/usr/local/opt/openssl@1.1/lib" dotnet run \
--project runtimes/net/tests/ \
--framework net6.0
--framework $(FRAMEWORK)

test_net_mac_brew: FRAMEWORK=net6.0
test_net_mac_brew:
DYLD_LIBRARY_PATH="$(shell brew --prefix)/opt/openssl@1.1/lib/" dotnet run \
--project runtimes/net/tests/ \
--framework net6.0
--framework $(FRAMEWORK)

setup_net:
dotnet restore runtimes/net/

0 comments on commit 554ee57

Please sign in to comment.