Skip to content

Commit

Permalink
Fix tests and update Actions (#940)
Browse files Browse the repository at this point in the history
  • Loading branch information
yahavi committed May 28, 2024
1 parent b6506c2 commit c881069
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 20 deletions.
2 changes: 0 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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.
-----
6 changes: 3 additions & 3 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/frogbot-scan-and-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frogbot-scan-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c881069

Please sign in to comment.