Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
DomCR committed Aug 15, 2024
2 parents 2fd0f57 + ed0b790 commit a964ff9
Show file tree
Hide file tree
Showing 562 changed files with 89,789 additions and 7,085 deletions.
11 changes: 5 additions & 6 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:
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
21 changes: 21 additions & 0 deletions .github/workflows/wiki-gen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Wiki genrator

on:
push:
branches: [ master ]

jobs:
build:
runs-on: windows-latest
steps:
- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
with:
submodules: true
- name: Update Wiki
run: ./update-wiki.sh
shell: bash
env:
ASSEMBLY_PATH: "src/ACadSharp/bin/Release/net6.0/ACadSharp.dll"
GITHUB_TOKEN: ${{ github.token }}
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
44 changes: 0 additions & 44 deletions ACadSharp.Examples/IOExamples.cs

This file was deleted.

34 changes: 0 additions & 34 deletions ACadSharp.Examples/ReaderExamples.cs

This file was deleted.

34 changes: 0 additions & 34 deletions ACadSharp.Tests/ACadSharp.Tests.csproj

This file was deleted.

30 changes: 0 additions & 30 deletions ACadSharp.Tests/CadObjectTests.cs

This file was deleted.

35 changes: 0 additions & 35 deletions ACadSharp.Tests/Entities/PolylineTest.cs

This file was deleted.

24 changes: 0 additions & 24 deletions ACadSharp.Tests/Objects/CadDictionaryTests.cs

This file was deleted.

20 changes: 0 additions & 20 deletions ACadSharp.Tests/Objects/ScaleCollectionTests.cs

This file was deleted.

43 changes: 0 additions & 43 deletions ACadSharp/ACadSharp.csproj

This file was deleted.

Loading

0 comments on commit a964ff9

Please sign in to comment.