From 0c893aba7ba8f4f7774475c41475830132899704 Mon Sep 17 00:00:00 2001
From: Maciej Kwidzinski <mkwidzinski@atlassian.com>
Date: Thu, 6 Jun 2024 12:41:40 +0200
Subject: [PATCH] Fix GitHub Actions warnings

---
 .github/workflows/ci.yml                      | 25 +++++++++++--------
 .../api/scenario/AbstractJiraCoreScenario.kt  |  2 +-
 .../api/scenario/RichTextEditorIT.kt          |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 833279ae..4ad7368a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,26 +19,29 @@ jobs:
       matrix:
         jira-version: ["8.20.0", "9.4.0", "9.8.0", "9.11.0"]
     env:
-      JIRA_SOFTWARE_VERSION: ${{ matrix.jira-version }}
+      JIRA_VERSION: ${{ matrix.jira-version }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+    - name: Setup Java
+      uses: actions/setup-java@v4
       with:
-        fetch-depth: 0
-    - name: Build
-      uses: gradle/gradle-build-action@v2
-      with:
-        gradle-version: wrapper
-        arguments: build
+        distribution: 'temurin'
+        java-version: 8
+        server-password: "" # avoid ```Unable to decrypt local Maven settings credentials```
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+    - name: Build with Gradle
+      run: ./gradlew build
     - name: Upload test reports
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: test-reports
         path: build/reports/tests
     - name: Upload diagnoses
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.jira-version }}-diagnoses
         path: build/diagnoses
@@ -56,7 +59,7 @@ jobs:
     if: github.event.inputs.release == 'yes'
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Get publish token
diff --git a/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt b/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt
index 1728857c..5bf9abe5 100644
--- a/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt
+++ b/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/AbstractJiraCoreScenario.kt
@@ -25,7 +25,7 @@ import java.time.ZonedDateTime
 abstract class AbstractJiraCoreScenario {
     private val logger: Logger = LogManager.getLogger(this::class.java)
 
-    protected val jiraVersion = System.getenv("JIRA_SOFTWARE_VERSION") ?: "8.0.0"
+    protected val jiraVersion = System.getenv("JIRA_VERSION") ?: "8.0.0"
 
     fun shouldRunScenarioWithoutErrors(jira: Jira, driver: RemoteWebDriver, rng: SeededRandom) {
         logger.info("Testing Jira $jiraVersion")
diff --git a/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/RichTextEditorIT.kt b/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/RichTextEditorIT.kt
index f54a8066..a76b3a10 100644
--- a/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/RichTextEditorIT.kt
+++ b/src/test/kotlin/com/atlassian/performance/tools/jiraactions/api/scenario/RichTextEditorIT.kt
@@ -29,7 +29,7 @@ class RichTextEditorIT {
 
     @Test
     fun shouldRunScenarioWithoutErrors() {
-        val version = System.getenv("JIRA_SOFTWARE_VERSION") ?: "8.0.0"
+        val version = System.getenv("JIRA_VERSION") ?: "8.0.0"
         logger.info("Testing Jira $version")
         val scenario = JiraEditScenario()
         val metrics = mutableListOf<ActionMetric>()