Skip to content

Commit

Permalink
Updated Makefiles and workflows as appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
AptiviCEO committed Apr 18, 2024
1 parent 7938e7b commit 39fc98e
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 101 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/build-rel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,19 @@ jobs:
runs-on: ${{ matrix.runs-on }}

steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Solution Compilation
run: dotnet build --configuration Release
- name: Testing
run: dotnet test --no-build --configuration Release
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Solution Compilation (Windows)
if: matrix.runs-on == 'windows-latest'
run: cd tools ; ./build.cmd ; cd ..
- name: Solution Compilation (Unix)
if: matrix.runs-on != 'windows-latest'
run: make
- name: Testing
run: dotnet test --no-build --configuration Release

26 changes: 15 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,19 @@ jobs:
runs-on: ${{ matrix.runs-on }}

steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Solution Compilation
run: dotnet build --configuration Debug
- name: Testing
run: dotnet test --no-build --configuration Debug
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Solution Compilation (Windows)
if: matrix.runs-on == 'windows-latest'
run: cd tools ; ./build.cmd Debug ; cd ..
- name: Solution Compilation (Unix)
if: matrix.runs-on != 'windows-latest'
run: make dbg
- name: Testing
run: dotnet test --no-build --configuration Debug

6 changes: 2 additions & 4 deletions .github/workflows/docgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ jobs:
dotnet-version: '8.0.x'
- name: Setup DocFX
run: dotnet tool install --global docfx
- name: Solution Compilation
run: dotnet build --configuration Release
- name: Generating documentation
run: docfx DocGen/docfx.json
- name: Generating Documentation
run: make doc
- name: Saving changes to gh-pages
uses: peaceiris/actions-gh-pages@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
dotnet-version: '8.0.x'
- name: Solution Compilation
run: dotnet build --configuration Release
run: make
- name: Package Publication
run: dotnet nuget push "VisualCard/bin/Release/*.nupkg" --api-key ${{ secrets.NUGET_APIKEY }} --source "nuget.org"

45 changes: 22 additions & 23 deletions .github/workflows/prepdraft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,28 @@ on:
jobs:
build:

runs-on: windows-latest
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Setup DocFX
run: dotnet tool install --global docfx
- name: Release Asset Preparation
run: |
cd tools ; ./build.cmd ; cd ..
cd tools ; ./pack.cmd ; cd ..
cd tools ; ./docgen.cmd ; cd ..
cd tools ; ./docgen-pack.cmd ; cd ..
- name: Release Draft Making
uses: softprops/action-gh-release@v1
with:
body: "This is a draft release. Fill this with a release snippet from the release sheet made internally."
draft: true
files: |
tools/*.zip
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Setup DocFX
run: dotnet tool install --global docfx
- name: Release Asset Preparation
run: |
chmod +x tools/*.sh
make doc
cd tools ; ./docgen-pack.sh ; cd ..
- name: Release Draft Making
uses: softprops/action-gh-release@v1
with:
body: "This is a draft release. Fill this with a release snippet from the release sheet made internally."
draft: true
files: |
tools/*.zip
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ all: all-online
all-online:
$(MAKE) -C tools invoke-build

dbg:
$(MAKE) -C tools invoke-build ENVIRONMENT=Debug

doc:
$(MAKE) -C tools invoke-doc-build

clean:
rm -rf $(OUTPUTS)

Expand Down
6 changes: 5 additions & 1 deletion tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ DOTNET_HEAP_LIMIT = $(shell printf '%X\n' $$(($(DOTNET_AVPHYS_PAGES) * $(DOTNET_

invoke-build:
chmod +x ./build.sh
./build.sh || (echo Retrying with heap limit 0x$(DOTNET_HEAP_LIMIT)... && DOTNET_GCHeapHardLimit=$(DOTNET_HEAP_LIMIT) ./build.sh)
./build.sh $(ENVIRONMENT) || (echo Retrying with heap limit 0x$(DOTNET_HEAP_LIMIT)... && DOTNET_GCHeapHardLimit=$(DOTNET_HEAP_LIMIT) ./build.sh $(ENVIRONMENT))

invoke-doc-build: invoke-build
chmod +x ./docgen.sh
./docgen.sh || (echo Retrying with heap limit 0x$(DOTNET_HEAP_LIMIT)... && DOTNET_GCHeapHardLimit=$(DOTNET_HEAP_LIMIT) ./docgen.sh)
20 changes: 0 additions & 20 deletions tools/pack.cmd

This file was deleted.

30 changes: 0 additions & 30 deletions tools/pack.sh

This file was deleted.

0 comments on commit 39fc98e

Please sign in to comment.