Skip to content

Commit

Permalink
conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mjkkirschner committed Jan 3, 2024
2 parents 6529beb + d8dc59b commit e9d7d54
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 5 deletions.
45 changes: 45 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Build DSIronPython package using msbuild
name: DSIronPython-VS2022Build
on: [push, pull_request, workflow_dispatch]
jobs:
build:
runs-on: windows-2022
steps:
- name: Checkout Repo
uses: actions/checkout@v4
with:
path: DSIronPython
repository: DynamoDS/DSIronPython
- name: Setup nuget
uses: nuget/[email protected]
- name: Setup msbuild
uses: microsoft/[email protected]
- name: Nuget Restore DSIronPython solution
run: nuget restore ${{ github.workspace }}\DSIronPython\DSIronPython.sln
- name: Build DSIronPython with MSBuild
run: |
Write-Output "***Continue with the build, Good luck developer!***"
msbuild ${{ github.workspace }}\DSIronPython\DSIronPython.sln
- name: Look for package
run: |
Write-Output "***Locating iron python package!***"
if (Test-Path -Path "${{ github.workspace }}\DSIronPython\package_output\DSIronPython\extra\DSIronPython.dll") {
Write-Output "python node dll exists!"
} else {
Write-Error "python node dll was not found!"
}
- name: Run test with the dotnet CLI
run: |
dotnet test ${{ github.workspace }}\DSIronPython --logger "trx;LogFileName=results.trx" --results-directory ${{ github.workspace }}\DSIronPython\TestResults
- name: Upload build artifact
uses: actions/[email protected]
with:
name: DSIronPython
path: ${{ github.workspace }}\DSIronPython\package_output
retention-days: 7
- name: Upload test artifact
uses: actions/[email protected]
with:
name: TestResults
path: ${{ github.workspace }}\DSIronPython\TestResults
retention-days: 1
25 changes: 25 additions & 0 deletions .github/workflows/publish_test_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Publish Test Report

on:
workflow_run:
workflows:
- DSIronPython-VS2022Build
types:
- completed

permissions:
contents: read
actions: read
checks: write

jobs:
publish_test_report:
name: Publish Test Report
runs-on: ubuntu-latest
steps:
- uses: dorny/[email protected]
with:
artifact: TestResults
name: Test Results
path: '*.trx'
reporter: dotnet-trx
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ bld/
[Oo]ut/
[Ll]og/
[Ll]ogs/
package_output/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down Expand Up @@ -360,4 +361,4 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd
6 changes: 2 additions & 4 deletions IronPythonExtension/IronPythonExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ public void Ready(ReadyParams rp)
hwm.Run();
}
}

/// <summary>
/// Action to be invoked when shutdown has begun.
/// </summary>
public void Shutdown()
{
// Do nothing for now
Expand Down Expand Up @@ -138,6 +134,8 @@ private static void LoadPythonEngine(Assembly assembly)
throw new Exception($"Failed to add a Python engine from assembly {assembly.GetName().Name}.dll with error: {ex.Message}");
}
}


}
internal class IsolatedPythonContext : AssemblyLoadContext
{
Expand Down

0 comments on commit e9d7d54

Please sign in to comment.