Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pdf-project-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
DomCR committed Aug 31, 2024
2 parents 2be0d10 + c3d924b commit 0759692
Show file tree
Hide file tree
Showing 525 changed files with 2,032 additions and 1,065 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ jobs:
runs-on: windows-latest

steps:
- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
with:
with:
submodules: true
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Restore dependencies and Build
working-directory: src
run: |
dotnet restore
dotnet build --configuration Release --no-restore
29 changes: 11 additions & 18 deletions .github/workflows/build_n_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,22 @@ on:
pull_request:
branches: [ master ]

env:
SAMPLES_FOLDER: "../../../../samples"
OUTPUT_SAMPLES_FOLDER: "../../../../samples/out"
OUTPUT_SINGLE_CASES_FOLDER: "../../../../samples/out/single_cases"
LOCAL_ENV: "false"
DELTA: "0.00001"
DECIMAL_PRECISION: "5"
RUN_DWG_WRITER_SINGLE_CASES_TEST: "false"
defaults:
run:
working-directory: ./src

jobs:
build:

runs-on: windows-latest

steps:
- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
with:
submodules: true
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --configuration Release --no-build --verbosity normal
- uses: cardinalby/export-env-action@v2
with:
envFile: 'github.env'
- name: Build and test
run: |
dotnet restore
dotnet build --configuration Release --no-restore
dotnet test --configuration Release --no-build --verbosity normal
36 changes: 36 additions & 0 deletions .github/workflows/coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Coveralls

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: cardinalby/export-env-action@v2
with:
envFile: 'github.env'
- name: Build and Test ACadSharp
working-directory: src
run: |
dotnet restore
dotnet build --no-restore
dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal ACadSharp.Tests/
- name: Build and Test Submodules
working-directory: src/CSUtilities
run: |
dotnet restore
dotnet build --no-restore
dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal CSUtilities.Tests/
dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal CSMath.Tests/
- name: Coveralls action
uses: coverallsapp/github-action@v2
with:
github-token: ${{ github.token }}
files: src/ACadSharp.Tests/TestResults/coverage.info src/CSUtilities/CSUtilities.Tests/TestResults/coverage.info src/CSUtilities/CSMath.Tests/TestResults/coverage.info
2 changes: 0 additions & 2 deletions .github/workflows/wiki-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ on:

jobs:
build:

runs-on: windows-latest
steps:

- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "CSUtilities"]
path = CSUtilities
url = https://github.com/DomCR/CSUtilities
[submodule "src/CSUtilities"]
path = src/CSUtilities
url = https://github.com/DomCR/CSUtilities.git
34 changes: 0 additions & 34 deletions ACadSharp.Tests/ACadSharp.Tests.csproj

This file was deleted.

31 changes: 0 additions & 31 deletions ACadSharp.Tests/Entities/ArcTests.cs

This file was deleted.

84 changes: 0 additions & 84 deletions ACadSharp.Tests/IO/LocalSampleTests.cs

This file was deleted.

37 changes: 0 additions & 37 deletions ACadSharp/Entities/Hatch.BoundaryPath.cs

This file was deleted.

76 changes: 0 additions & 76 deletions ACadSharp/Entities/PolyFaceMesh.cs

This file was deleted.

12 changes: 0 additions & 12 deletions ACadSharp/Exceptions/DwgNotSupportedException.cs

This file was deleted.

Loading

0 comments on commit 0759692

Please sign in to comment.