Skip to content

Commit 811fe6c

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 570464c + 5ac9f63 commit 811fe6c

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

.github/workflows/build.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ jobs:
1313
run:
1414
shell: bash
1515

16-
name: Build
16+
strategy:
17+
matrix:
18+
release:
19+
- type: Debug
20+
suffix: '-debug'
21+
- type: Release
22+
suffix: ''
23+
24+
name: Build (${{ matrix.release.type }})
1725

1826
steps:
1927
- uses: actions/checkout@v2
@@ -27,11 +35,11 @@ jobs:
2735
run: dotnet restore
2836

2937
- name: Build
30-
run: dotnet build -c Release
38+
run: dotnet build -c ${{ matrix.release.type }} -p:Version=0.0.0-rolling+${{ github.sha }}
3139

3240
- name: Zip
3341
if: "! startsWith(github.event_name, 'pull_request')"
34-
run: 7z a -tzip -mx9 SharpHound.zip bin/Release/net462
42+
run: 7z a -tzip -mx9 SharpHound${{ matrix.release.suffix }}.zip $PWD/bin/${{ matrix.release.type }}/net462/*
3543

3644
- name: Update Rolling Release
3745
if: "! startsWith(github.event_name, 'pull_request')"
@@ -40,7 +48,7 @@ jobs:
4048
name: Rolling Release (unstable)
4149
tag_name: rolling
4250
prerelease: true
43-
files: SharpHound.zip
51+
files: SharpHound${{ matrix.release.suffix }}.zip
4452
body: |
4553
Rolling release of SharpHound compiled from source (${{ github.sha }})
4654
This is automatically kept up-to-date with the `${{ github.ref_name }}` ${{ github.ref_type }}.

.github/workflows/publish.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ jobs:
1212
run:
1313
shell: bash
1414

15-
name: Build
15+
strategy:
16+
matrix:
17+
release:
18+
- type: Debug
19+
suffix: '-debug'
20+
- type: Release
21+
suffix: ''
22+
23+
name: Build (${{ matrix.release.type }})
1624

1725
steps:
1826
- uses: actions/checkout@v2
@@ -28,12 +36,12 @@ jobs:
2836
- name: Build
2937
run: |
3038
VERSION=${{ github.ref_name }}
31-
dotnet build -c Release -p:Version=${VERSION:1}
39+
dotnet build -c ${{ matrix.release.type }} -p:Version=${VERSION:1}
3240
3341
- name: Zip
34-
run: 7z a -tzip -mx9 SharpHound-${{ github.ref_name }}.zip bin/Release/net462
42+
run: 7z a -tzip -mx9 SharpHound-${{ github.ref_name }}${{ matrix.release.suffix }}.zip $PWD/bin/${{ matrix.release.type }}/net462/*
3543

3644
- name: Upload to Release
3745
uses: softprops/action-gh-release@v1
3846
with:
39-
files: SharpHound-${{ github.ref_name }}.zip
47+
files: SharpHound-${{ github.ref_name }}${{ matrix.release.suffix }}.zip

0 commit comments

Comments
 (0)