From 5d1516c50ebad61d1f32ba2fc300a192452d54ad Mon Sep 17 00:00:00 2001
From: ashakoor <60638768+ashakoor@users.noreply.github.com>
Date: Fri, 3 Dec 2021 03:25:13 -0500
Subject: [PATCH] port GH actions config from main

---
 .github/workflows/main.yml    | 33 ++++++++++++---------------------
 .github/workflows/release.yml | 22 ++++++++++------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c3114ab..877a048 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Main PR/push + stable push
+name: main PR+push / stable push
 
 on:
   push:
@@ -8,11 +8,9 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-    
+
     env:
-      dotnet_sdk_version: '5.0.x'
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       TEST_BUNGIE_API_KEY: ${{ secrets.TEST_BUNGIE_API_KEY }}
@@ -21,34 +19,27 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Get short SHA
-      uses: benjlevesque/short-sha@v1.2
-      id: short-sha
-      with:
-        length: 8
+    - name: Get version suffix
+      id: get_suffix
+      run: echo ::set-output name=SUFFIX::${GITHUB_SHA:0:9}
 
-    - name: Setup .NET
+    - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: ${{ env.dotnet_sdk_version }}
-
-    - name: Build client
-      run: dotnet build ./BungieSharper -c Release
+        dotnet-version: 5.0.x
+        include-prerelease: false
 
     - name: Pack entities NuGet package
-      run: dotnet pack ./BungieSharper.Entities -c Release --no-build --output OutputPackage --version-suffix "ci.$(date -u +%Y%m%dT%H%M%S)+sha.${GITHUB_SHA:0:9}" -p:ContinuousIntegrationBuild=true
+      run: dotnet pack ./BungieSharper.Entities -c Release --output OutputPackage -p:ContinuousIntegrationBuild=true -p:VersionSuffix=${{ steps.get_suffix.outputs.SUFFIX }}
 
     - name: Pack client NuGet package
-      run: dotnet pack ./BungieSharper -c Release --no-build --output OutputPackage --version-suffix "ci.$(date -u +%Y%m%dT%H%M%S)+sha.${GITHUB_SHA:0:9}" -p:ContinuousIntegrationBuild=true
+      run: dotnet pack ./BungieSharper -c Release --output OutputPackage -p:ContinuousIntegrationBuild=true -p:VersionSuffix=${{ steps.get_suffix.outputs.SUFFIX }}
 
     - name: Upload artifact (nupkg/snupkg)
       uses: actions/upload-artifact@v1
       with:
-        name: BungieSharper - ${{ env.SHA }}
+        name: BungieSharper_${{ steps.get_suffix.outputs.SUFFIX }}
         path: OutputPackage
 
-    - name: Build test
-      run: dotnet build ./BungieSharper.Tests -c Release
-
     - name: Run test
-      run: dotnet test ./BungieSharper.Tests -c Release --no-build --verbosity normal
\ No newline at end of file
+      run: dotnet test ./BungieSharper.Tests -c Release --verbosity normal
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 325fc3e..3a55186 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,8 +8,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     env:
-      dotnet_sdk_version: '5.0.x'
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       TEST_BUNGIE_API_KEY: ${{ secrets.TEST_BUNGIE_API_KEY }}
@@ -22,19 +22,17 @@ jobs:
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
 
-    - name: Setup .NET
+    - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: ${{ env.dotnet_sdk_version }}
-
-    - name: Build client
-      run: dotnet build ./BungieSharper -c Release -p:Version=${{ steps.get_version.outputs.VERSION }}
+        dotnet-version: 5.0.x
+        include-prerelease: false
 
     - name: Pack entities NuGet package
-      run: dotnet pack ./BungieSharper.Entities -c Release --no-build --output Packages -p:ContinuousIntegrationBuild=true -p:Version=${{ steps.get_version.outputs.VERSION }}
+      run: dotnet pack ./BungieSharper.Entities -c Release --output Packages -p:ContinuousIntegrationBuild=true -p:Version=${{ steps.get_version.outputs.VERSION }}
 
     - name: Pack client NuGet package
-      run: dotnet pack ./BungieSharper -c Release --no-build --output Packages -p:ContinuousIntegrationBuild=true -p:Version=${{ steps.get_version.outputs.VERSION }}
+      run: dotnet pack ./BungieSharper -c Release --output Packages -p:ContinuousIntegrationBuild=true -p:Version=${{ steps.get_version.outputs.VERSION }}
 
     - name: Create Release
       id: create_release
@@ -93,16 +91,16 @@ jobs:
     
     - name: Upload entities to NuGet
       run: |
-        dotnet nuget push ./Packages/BungieSharper.Entities.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate    
+        dotnet nuget push ./Packages/BungieSharper.Entities.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
 
     - name: Upload client to NuGet
       run: |
-        dotnet nuget push ./Packages/BungieSharper.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
+        dotnet nuget push ./Packages/BungieSharper.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
     
     - name: Upload entities to GitHub Packages
       run: |
-        dotnet nuget push ./Packages/BungieSharper.Entities.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/ashakoor/index.json --skip-duplicate
+        dotnet nuget push ./Packages/BungieSharper.Entities.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/ashakoor/index.json
 
     - name: Upload client to GitHub Packages
       run: |
-        dotnet nuget push ./Packages/BungieSharper.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/ashakoor/index.json --skip-duplicate
\ No newline at end of file
+        dotnet nuget push ./Packages/BungieSharper.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/ashakoor/index.json
\ No newline at end of file