Updated SB

Remove release tag earlier in GHA Output built version in GHA summary
sundews · Nov 26, 2023 · 8ed35c1 · 8ed35c1
1 parent ff63a21
commit 8ed35c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -61,6 +61,9 @@ jobs:
         --output-file $GITHUB_OUTPUT
 
         cb match -p "^refs/tags/release[^/]*$ => isReleaseCommand=true" -i "${{ github.ref }}" -of $GITHUB_OUTPUT
+    - name: 'Remove release tag'
+      if: ${{ steps.stage-build.outputs.stage == 'production' }}
+      run: cb --if "${{ steps.stage-build.outputs.isReleaseCommand }} == true" -c "git|push --delete ${{ env.repository }} ${{ github.ref }}"
     - name: Restore
       run: dotnet restore ${{ env.solutionPath }} --verbosity normal -s ${{ env.source }}${{ steps.stage-build.outputs.dev-package-source-if-set }}
     - name: Build
@@ -80,12 +83,13 @@ jobs:
     - name: 'Tag stable version'
       if: ${{ steps.stage-build.outputs.stage == 'production' }}
       run: |
-        git config user.email "sundew-dev@outlook.com"
-        git config user.name "sundew-build"
+        git config user.email "${{ secrets.BUILD_EMAIL }}"
+        git config user.name "${{ secrets.BUILD_USERNAME }}"
         git tag -a v.${{ steps.stage-build.outputs.version }} -m "v.${{ steps.stage-build.outputs.version }}"
         git push ${{ env.repository }} v.${{ steps.stage-build.outputs.version }}
-
-        cb --if "${{ steps.stage-build.outputs.isReleaseCommand }} == true" -c "git|push --delete ${{ env.repository }} ${{ github.ref }}"
     - name: 'Await stable package publish'
       if: ${{ steps.stage-build.outputs.stage == 'production' }}
-      run: cb -c "spt|await -s ${{ steps.stage-build.outputs.feedSource }} {0}.{2}" -bs NewLine -bvs '=' -bf ${{ env.source-packages-to-push }}
+      run: cb -c "spt|await -s ${{ steps.stage-build.outputs.feedSource }} {0}.{2}" -bs NewLine -bvs '=' -bf ${{ env.source-packages-to-push }}
+    - name: 'Summary'
+      run: |
+        echo '### Pushed version: ${{ steps.stage-build.outputs.fullVersion }}' >> $GITHUB_STEP_SUMMARY
diff --git a/Source/Sundew.CommandLine/Sundew.CommandLine.csproj b/Source/Sundew.CommandLine/Sundew.CommandLine.csproj
@@ -58,9 +58,9 @@ Features:
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Sundew.Base.Collections" Version="11.0.1" />
-    <PackageReference Include="Sundew.Base.Primitives" Version="11.0.1" />
-    <PackageReference Include="Sundew.Base.Text" Version="11.0.1" />
+    <PackageReference Include="Sundew.Base.Collections" Version="11.0.2" />
+    <PackageReference Include="Sundew.Base.Primitives" Version="11.0.2" />
+    <PackageReference Include="Sundew.Base.Text" Version="11.0.2" />
     <PackageReference Include="Sundew.Packaging.Publish" Version="8.2.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>