From 51a65cabeda7661e4deaa23ff51d3eebece2bb30 Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 14:01:30 -0700 Subject: [PATCH 1/6] feat: build pipeline should target SHC git-dev for merge status checks --- .github/workflows/build.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79c04a8..b187767 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,13 +24,24 @@ jobs: name: Build (${{ matrix.release.type }}) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: 5.0.x + - name: Replace SharpHound library refs with git-dev + run: | + CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundCommon"' .) + for csproj in "${CSPROJ_FILES[@]}"; do + sed -i "s|||" $csproj + done + CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' .) + for csproj in "${CSPROJ_FILES[@]}"; do + sed -i "s|||" $csproj + done + - name: Restore Dependencies run: dotnet restore @@ -43,7 +54,7 @@ jobs: - name: Update Rolling Release if: "! startsWith(github.event_name, 'pull_request')" - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: name: Rolling Release (unstable) tag_name: rolling From b045ad365159ffc2cac0b259d421861ee51c11ba Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 14:08:15 -0700 Subject: [PATCH 2/6] fix: SharpHoundRPC sed --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b187767..2a0e7e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: done CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' .) for csproj in "${CSPROJ_FILES[@]}"; do - sed -i "s|||" $csproj + sed -i "s|||" $csproj done - name: Restore Dependencies From e6c9d34960f4eafe8b66ba3f4acd7e82b110274d Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 14:12:09 -0700 Subject: [PATCH 3/6] chore: More posix-friendly while loop --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a0e7e3..8504d54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Build on: push: - branches: [ dev ] + branches: [dev] pull_request: - branches: [ dev ] + branches: [dev] jobs: build: @@ -17,9 +17,9 @@ jobs: matrix: release: - type: Debug - suffix: '-debug' + suffix: "-debug" - type: Release - suffix: '' + suffix: "" name: Build (${{ matrix.release.type }}) @@ -33,14 +33,14 @@ jobs: - name: Replace SharpHound library refs with git-dev run: | - CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundCommon"' .) - for csproj in "${CSPROJ_FILES[@]}"; do - sed -i "s|||" $csproj - done - CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' .) - for csproj in "${CSPROJ_FILES[@]}"; do - sed -i "s|||" $csproj - done + grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundCommon"' . \ + | while IFS= read -r csproj; do + sed -i "s|||" $csproj + done + CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' .) \ + | while IFS= read -r csproj; do + sed -i "s|||" $csproj + done - name: Restore Dependencies run: dotnet restore From a4eaa8b2ab787226907e23377aa5a8ff966c54b2 Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 14:12:48 -0700 Subject: [PATCH 4/6] fix: missed a correction --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8504d54..ce6783f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: | while IFS= read -r csproj; do sed -i "s|||" $csproj done - CSPROJ_FILES=$(grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' .) \ + grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' . \ | while IFS= read -r csproj; do sed -i "s|||" $csproj done From c4f86d97790c89fcf765fa4955cf556e4cf1d04c Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 14:40:44 -0700 Subject: [PATCH 5/6] fix: Need proper version string for nuget --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce6783f..0574f9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,11 +35,11 @@ jobs: run: | grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundCommon"' . \ | while IFS= read -r csproj; do - sed -i "s|||" $csproj + sed -i "s|||" $csproj done grep -rl --include="*.csproj" 'PackageReference Include="SharpHoundRPC"' . \ | while IFS= read -r csproj; do - sed -i "s|||" $csproj + sed -i "s|||" $csproj done - name: Restore Dependencies From c82ced817b704e48a194f62c6a275c367b4cfadd Mon Sep 17 00:00:00 2001 From: anemeth Date: Thu, 24 Jul 2025 15:34:53 -0700 Subject: [PATCH 6/6] fix: run build workflow on PR --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0574f9e..47db5a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,8 @@ name: Build on: - push: - branches: [dev] pull_request: - branches: [dev] + types: [opened, synchronize] jobs: build: