Skip to content

Commit

Permalink
Merge branch 'master' into InstancingOption
Browse files Browse the repository at this point in the history
  • Loading branch information
saintentropy committed Apr 4, 2024
2 parents c949a0d + b33bd17 commit 3fcc1a5
Show file tree
Hide file tree
Showing 1,248 changed files with 447,740 additions and 38,285 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Issues_workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
id: regex-match
with:
text: ${{github.event.issue.title}}
regex: '^[A-Za-z0-9 _.]*$'
regex: '[^\x00-\x7F]+|[a-zA-Z0-9?.><;,{}()[\]\-_+=!@#$%\^&*|''\s]+'
flags: g

#If the regex output is '' means that the issue title contains special chars
Expand All @@ -37,7 +37,7 @@ jobs:
#Remove the " character in the issue title and replaced with -
- name: Remove conflicting chars
uses: frabert/replace-string-action@v2.4
uses: frabert/replace-string-action@v2.5
id: remove_quotations
with:
pattern: "\""
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Remove conflicting chars
env:
ISSUE_BODY: ${{github.event.issue.body}}
uses: frabert/replace-string-action@v2.4
uses: frabert/replace-string-action@v2.5
id: remove_quotations
with:
pattern: "\""
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/build_dynamo_all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Build DynamoAll.sln with .NET 8.0
name: Build DynamoAll.sln net8.0

on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/[email protected]
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo with MSBuild for Windows
run: |
Write-Output "***Continue with the build, Good luck developer!***"
msbuild ${{ github.workspace }}\Dynamo\src\Dynamo.All.sln /p:Configuration=Release
- name: Look for DynamoCLI.exe
run: |
Write-Output "***Locating DynamoCLI.exe!***"
if (Test-Path -Path "${{ github.workspace }}\Dynamo\bin\AnyCPU\Release\DynamoCLI.exe") {
Write-Output "DynamoCLI.exe exists!"
} else {
Write-Error "DynamoCLI.exe was not found!"
}
- name: Upload Build Artifact
uses: actions/upload-artifact@v4
with:
name: DynamoSandbox
path: ${{ github.workspace }}\Dynamo\bin\AnyCPU\Release
if-no-files-found: warn
retention-days: 3
save_pr_data:
name: Save PR Data
runs-on: ubuntu-latest
steps:
- name: Save PR Data
run: |
mkdir -p ${{ github.workspace }}/pr
echo ${{ github.event.number }} > ${{ github.workspace }}/pr/pr_number.txt
- name: Upload PR Data
uses: actions/upload-artifact@v4
with:
name: pr_data
path: ${{ github.workspace }}/pr
if-no-files-found: warn
retention-days: 3
57 changes: 0 additions & 57 deletions .github/workflows/build_dynamo_all_net6.0.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/build_dynamo_all_net8.0.yml

This file was deleted.

40 changes: 40 additions & 0 deletions .github/workflows/build_dynamo_core_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Build DynamoCore.sln with .NET 8.0 on linux
name: Build DynamoCore.sln net8.0 linux

on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v4
with:
path: Dynamo
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Disable problem matcher
run: echo "::remove-matcher owner=csc::"
- name: Install dependencies for linux runtime
run: dotnet restore ${{ github.workspace }}/Dynamo/src/DynamoCore.sln -p:Platform=NET_Linux --runtime=linux-x64
- name: Build Dynamo with MSBuild for Linux
run: |
echo "***Continue with the build, Good luck developer!***"
dotnet build ${{ github.workspace }}/Dynamo/src/DynamoCore.sln -c Release /p:Platform=NET_Linux
- name: Look for DynamoCLI.exe
run: |
cd "${{ github.workspace }}/Dynamo/bin/NET_Linux/Release"
echo "***Locating DynamoCLI for Linux!***"
test "./DynamoCLI.exe" && echo "DynamoCLI exists!"
- name: Run smoke tests
run: |
cd "${{ github.workspace }}/Dynamo/bin/NET_Linux/Release"
echo "***Running Smoke tests on linux***"
#TODO unfortunately dotnet does not find any tests in this assembly.
#dotnet test DynamoCoreTests.dll --filter "TestCategory~UnitTest"
39 changes: 0 additions & 39 deletions .github/workflows/build_dynamo_core_net6.0_linux.yml

This file was deleted.

51 changes: 0 additions & 51 deletions .github/workflows/build_dynamo_core_net6.0_windows.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/workflows/build_dynamo_core_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Build DynamoCore.sln with .NET 6.0 on windows
name: Build DynamoCore.sln net6.0 windows

on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout Dynamo Repo
uses: actions/checkout@v4
with:
path: Dynamo
repository: DynamoDS/Dynamo
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Disable problem matcher
run: Write-Output "::remove-matcher owner=csc::"
- name: Setup msbuild
uses: microsoft/[email protected]
- name: Install dependencies for windows runtime
run: |
dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release --runtime=win-x64
- name: Build Dynamo with MSBuild for Windows
run: |
Write-Output "***Continue with the build, Good luck developer!***"
msbuild ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release
- name: Look for DynamoCLI.exe
run: |
Write-Output "***Locating DynamoCLI.exe!***"
if (Test-Path -Path "${{ github.workspace }}\Dynamo\bin\AnyCPU\Release\DynamoCLI.exe") {
Write-Output "DynamoCLI.exe exists!"
} else {
Write-Error "DynamoCLI.exe was not found!"
}
- name: Install dependencies for linux runtime
run: dotnet restore ${{ github.workspace }}\Dynamo\src\DynamoCore.sln -p:Platform=NET_Linux --runtime=linux-x64
- name: Build Dynamo with MSBuild for Linux
run: |
Write-Output "***Continue with the build, Good luck developer!***"
msbuild ${{ github.workspace }}\Dynamo\src\DynamoCore.sln /p:Configuration=Release /p:Platform=NET_Linux
- name: Look for DynamoCLI
run: |
Write-Output "***Locating DynamoCLI for Linux!***"
if (Test-Path -Path "${{ github.workspace }}\Dynamo\bin\NET_Linux\Release\DynamoCLI") {
Write-Output "DynamoCLI exists!"
} else {
Write-Error "DynamoCLI was not found!"
}
Loading

0 comments on commit 3fcc1a5

Please sign in to comment.