Merge pull request #292 from justeat/develop

develop into master
justeat · Jun 13, 2023 · fa410a8 · fa410a8
2 parents 1ef13e3 + 95a5033
commit fa410a8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
     branches: [ master ]
     tags: [ v* ]
   pull_request:
-    branches: [ master, dotnet-vnext ]
+    branches: [ master, develop ]
   workflow_dispatch:
 
 env:
@@ -44,21 +44,36 @@ jobs:
       shell: pwsh
       run: ./build.ps1 --target=Run-Unit-Tests
 
-    - name: Run Integration tests
-      shell: pwsh
-      run: ./build.ps1 --target=Run-Integration-Tests --zendeskUrl=${{ secrets.ZENDESK_URL }} --zendeskUsername=${{ secrets.ZENDESK_USERNAME }} --zendeskToken=${{ secrets.ZENDESK_TOKEN }}
-
     - name: Package
       shell: pwsh
       run: ./build.ps1 --target=Package
 
     - name: Publish NuGet package to Github actions cache
       uses: actions/upload-artifact@v3
       with:
-        name: packages-${{ matrix.os_name }}
+        name: packages-windows
         path: ./artifacts
         if-no-files-found: error
 
+  run-integration-tests:
+    runs-on: windows-latest
+    if: |
+      github.event.repository.fork == false &&
+      github.event.pull_request.head.ref == 'develop'
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '3.1.x'
+
+    - name: Run Integration tests
+      shell: pwsh
+      run: ./build.ps1 --target=Run-Integration-Tests --zendeskUrl=${{ secrets.ZENDESK_URL }} --zendeskUsername=${{ secrets.ZENDESK_USERNAME }} --zendeskToken=${{ secrets.ZENDESK_TOKEN }}
+
   publish-nuget:
     needs: build
     runs-on: windows-latest

diff --git a/src/ZendeskApi.Build/ZendeskApi.Commons.props b/src/ZendeskApi.Build/ZendeskApi.Commons.props
@@ -30,7 +30,7 @@
       <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
 
       <!-- Remove for release -->
-      <PrereleaseLabel>-alpha</PrereleaseLabel>
+      <!-- <PrereleaseLabel>-alpha</PrereleaseLabel> -->
 
       <BuildSuffix Condition=" '$(PrereleaseLabel)' != '' ">$(PrereleaseLabel)-$(BuildNumber)</BuildSuffix>
       <BuildSuffix Condition=" '$(BuildSuffix)' == '' "></BuildSuffix>