From fd9290416114191c3f6bb67544b7f2cc5083ab57 Mon Sep 17 00:00:00 2001
From: mschaab <53225534+mschaab-SA@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:11:47 -0300
Subject: [PATCH] Merge conflict (#170)

* v1.1.0.10 (#136)

* Preferred MFA: field auth_type -> type  + biometric_type

* Changing artifact requirements

* Updating actions

* Updating deprecated upload artifact

* Fixing conditional for artifacts

---------

Co-authored-by: glacuesta <89663911+glacuesta-sa@users.noreply.github.com>
---
 .github/workflows/github-actions.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d8a6972..23e418e 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -7,12 +7,12 @@ jobs:
     steps:
       - name: Check out repository code ⬇️
         uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
       - name: Setup Gradle 🐘
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Run build with Gradle Wrapper 🏃
@@ -21,12 +21,13 @@ jobs:
         run: ./gradlew test
       # Might want to remove this step
       - name: Archive production artifacts ⬆️
-        if: ${{ github.event_name == 'pull_request' && github.pull_request_target == 'master' }}
-        uses: actions/upload-artifact@v3
+      # Changed from target 'master' to 'develop' because the rules for the repo are locking my uploads
+        if: github.event.pull_request.base.ref == 'develop'
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: ./build/libs/saRestApi-*.jar
-      - uses: jfrog/setup-jfrog-cli@v3
+      - uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ secrets.ARTIFACTORY_URL }}
           JF_USER: ${{ secrets.JFROG_USERNAME }}