From 2f9963581378b6d3cd312c216bcb375fab142561 Mon Sep 17 00:00:00 2001
From: Abdelrahman Shawki Hassan <shawki.hassan@snyk.io>
Date: Tue, 9 Jul 2024 15:06:40 +0200
Subject: [PATCH] feat: run integration tests on PR (#281)

* feat: run integration tests on PR
---
 .github/workflows/build-project.yml                   |  2 +-
 .github/workflows/integration-tests.yml               | 11 +++++++----
 .github/workflows/pr-workflow.yml                     | 10 +++++++---
 .github/workflows/release.yml                         |  8 ++++----
 .../Integration.Pre22.Tests.csproj                    |  6 +++---
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
index ef47bb26f..af8bfef69 100644
--- a/.github/workflows/build-project.yml
+++ b/.github/workflows/build-project.yml
@@ -20,7 +20,7 @@ jobs:
     outputs:
       version: ${{ steps.vsix_version.outputs.next-tag }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Calculate next semantic version Git tag (vsix version)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 30f939a1c..d8314bbdb 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -1,6 +1,7 @@
 name: Integration Tests
 
 on:
+  workflow_dispatch:
   workflow_call:
     secrets:
       TEST_API_TOKEN:
@@ -8,6 +9,7 @@ on:
 
 jobs:
   test-vs19:
+    continue-on-error: true
     runs-on: windows-2019
     defaults:
       run:
@@ -15,9 +17,9 @@ jobs:
     env:
       TEST_API_TOKEN: ${{ secrets.TEST_API_TOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Download build artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: build-artifacts
     - name: Setup VSTest
@@ -26,6 +28,7 @@ jobs:
       run: vstest.console.exe **\bin\**\*Integration.Pre22.Tests.dll
 
   test-vs22:
+    continue-on-error: true
     runs-on: windows-2022
     defaults:
       run:
@@ -33,9 +36,9 @@ jobs:
     env:
       TEST_API_TOKEN: ${{ secrets.TEST_API_TOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Download build artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: build-artifacts
     - name: Setup VSTest
diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml
index b7f7636f8..91419fd47 100644
--- a/.github/workflows/pr-workflow.yml
+++ b/.github/workflows/pr-workflow.yml
@@ -28,15 +28,19 @@ jobs:
       TEST_API_TOKEN: ${{ secrets.TEST_API_TOKEN }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Download build artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: build-artifacts
 
     - name: Setup VSTest
       uses: darenm/Setup-VSTest@v1
     - name: Tests
-      run: vstest.console.exe **\*.Tests.dll /TestCaseFilter:"FullyQualifiedName!=Xunit.Instances.VisualStudio&integration!=true" #exclude integration tests and the psuedo-tests that launch a VS instance
\ No newline at end of file
+      run: vstest.console.exe **\*.Tests.dll /TestCaseFilter:"FullyQualifiedName!=Xunit.Instances.VisualStudio&integration!=true" #exclude integration tests and the psuedo-tests that launch a VS instance
+  run-integration-tests:
+    needs: build-project
+    uses: snyk/snyk-visual-studio-plugin/.github/workflows/integration-tests.yml@main
+    secrets: inherit      
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29e8f05f4..046a0377d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,11 +28,11 @@ jobs:
       TEST_API_TOKEN: ${{ secrets.TEST_API_TOKEN }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Download build artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: build-artifacts
 
@@ -51,11 +51,11 @@ jobs:
       VsixManifestPath: .\Snyk.VisualStudio.Extension\source.extension.vsixmanifest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Download build artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: build-artifacts
 
diff --git a/Tests/Integration.Pre22.Tests/Integration.Pre22.Tests.csproj b/Tests/Integration.Pre22.Tests/Integration.Pre22.Tests.csproj
index e73759f23..9713c584d 100644
--- a/Tests/Integration.Pre22.Tests/Integration.Pre22.Tests.csproj
+++ b/Tests/Integration.Pre22.Tests/Integration.Pre22.Tests.csproj
@@ -48,13 +48,13 @@
       <Version>0.1.137-beta</Version>
     </PackageReference>
     <PackageReference Include="System.Collections.Immutable">
-      <Version>5.0.0</Version>
+      <Version>8.0.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.utility">
-      <Version>2.4.2</Version>
+      <Version>2.5.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.4.5</Version>
+      <Version>2.5.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>