Merge pull request #26 from bornlogic/fix/ci

main
bornlogic · Aug 23, 2023 · c50b774 · c50b774
2 parents 50914c0 + e754b3d
commit c50b774
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,9 +1,11 @@
 name: Test and Publish
 
 on:
-  push:
-    branches: [ master ]
-
+  pull_request_target:
+    types:
+      - closed
+    branches:    
+      - 'master'
 defaults:
   run:
     shell: bash
@@ -38,14 +40,14 @@ jobs:
     needs: test
     env:
       LAST_COMMITTER_EMAIL: $(git log -1 --pretty=format:'%ae')
-      BOT_NAME: Actions
-      BOT_EMAIL: [email protected]
+      BOT_TOKEN: secrets.BOT_ACCESS_TOKEN
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+        token: ${{ secrets.BOT_ACCESS_TOKEN }}
 
     - name: Install .NET Core for Versionize
       uses: actions/setup-dotnet@v1
@@ -62,14 +64,13 @@ jobs:
       run: dotnet build --configuration Release
 
     - name: Increment Version
-      if: ${{ success() && env.LAST_COMMITTER_EMAIL != env.BOT_EMAIL }}
+      if: ${{ success() }}
       run: |
-        git config --global user.name ${{ env.BOT_NAME }}
-        git config --global user.email ${{ env.BOT_EMAIL }}
-        git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+        git remote set-url origin https://x-access-token:${{ env.BOT_TOKEN }}@github.com/$GITHUB_REPOSITORY
         git checkout "${GITHUB_REF:11}"
         dotnet tool install --global Versionize --version 1.8.0
         versionize --skip-dirty && git push --follow-tags origin "${GITHUB_REF:11}"
+
     - name: Pack
       if: ${{ success() }}
       run: dotnet pack --configuration Release -o output
@@ -81,4 +82,4 @@ jobs:
         dotnet nuget push "output/*.nupkg" \
           --source https://nuget.pkg.github.com/bornlogic/index.json \
           --api-key ${{ secrets.GITHUB_TOKEN }} \
-          --skip-duplicate --no-symbols
+          --skip-duplicate --no-symbols
diff --git a/Bornlogic.IdentityServer.AspNetIdentity/Bornlogic.IdentityServer.AspNetIdentity.csproj b/Bornlogic.IdentityServer.AspNetIdentity/Bornlogic.IdentityServer.AspNetIdentity.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>3.0.1</Version>
+		<Version>3.0.2</Version>
 		<RepositoryUrl>https://github.com/bornlogic/bornlogic-identity-server</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

diff --git a/Bornlogic.IdentityServer.Culture/Bornlogic.IdentityServer.Culture.csproj b/Bornlogic.IdentityServer.Culture/Bornlogic.IdentityServer.Culture.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>3.0.1</Version>
+		<Version>3.0.2</Version>
 		<RepositoryUrl>https://github.com/bornlogic/bornlogic-identity-server</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

diff --git a/Bornlogic.IdentityServer.Storage/Bornlogic.IdentityServer.Storage.csproj b/Bornlogic.IdentityServer.Storage/Bornlogic.IdentityServer.Storage.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <RepositoryUrl>https://github.com/bornlogic/bornlogic-identity-server</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>

diff --git a/Bornlogic.IdentityServer/Bornlogic.IdentityServer.csproj b/Bornlogic.IdentityServer/Bornlogic.IdentityServer.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
 		<RepositoryUrl>https://github.com/bornlogic/bornlogic-identity-server</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>