From b5602c6066fe24acbd6e2da35620554a97c79923 Mon Sep 17 00:00:00 2001 From: yahavi Date: Mon, 27 May 2024 16:48:05 +0300 Subject: [PATCH] Fix tests and update Actions --- .github/PULL_REQUEST_TEMPLATE.md | 2 -- .github/workflows/analysis.yml | 6 +++--- .github/workflows/frogbot-scan-and-fix.yml | 8 ++++---- .github/workflows/frogbot-scan-pr.yml | 6 +++--- .github/workflows/tests.yml | 17 +++++++++-------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f635af54e..d3dfdb6c9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,3 @@ - [ ] This pull request is created in the [jfrog/jenkins-artifactory-plugin](https://github.com/jfrog/jenkins-artifactory-plugin) repository. - [ ] All [tests](https://ci.appveyor.com/project/jfrog-ecosystem/jenkins-artifactory-plugin) passed. If this feature is not already covered by the tests, I added new tests. -- [ ] All [static analysis checks](https://github.com/jfrog/jenkins-artifactory-plugin/actions/workflows/analysis.yml) - passed. ----- diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 6b1de3eac..6fd857ffd 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -5,13 +5,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: "8" - distribution: "temurin" + distribution: "zulu" - name: Configure Linux runner run: echo "MAVEN_HOME=$(whereis mvn)" >> $GITHUB_ENV diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index e20fe302d..88bcd4dc6 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -15,16 +15,16 @@ jobs: # The repository scanning will be triggered periodically on the following branches. branch: [ "master" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} # Install prerequisites - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: "11" - distribution: "adopt" + java-version: "8" + distribution: "zulu" - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 4f990ca84..203562580 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -12,16 +12,16 @@ jobs: # "frogbot" GitHub environment can approve the pull request to be scanned. environment: frogbot steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} # Install prerequisites - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: "8" - distribution: "temurin" + distribution: "zulu" - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5ba192ae5..d8c773150 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,33 +23,34 @@ jobs: GRADLE_OPTS: -Dorg.gradle.daemon=false steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x + cache: false - name: Install npm - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "16" - name: Install Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: "8" - distribution: "temurin" + distribution: "zulu" - name: Install NuGet - uses: nuget/setup-nuget@v1 + uses: nuget/setup-nuget@v2 with: nuget-version: 6.x - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x"