Skip to content

Commit

Permalink
Fix tests (#790)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobiNino authored May 22, 2024
1 parent 4f709b6 commit 9fc1247
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- [ ] All [tests](https://ci.appveyor.com/project/jfrog-ecosystem/build-info) passed. If this feature is not already covered by the tests, I added new tests.
- [ ] All [tests](https://github.com/jfrog/build-info/actions/workflows/integrationTests.yml) have passed. If this feature is not already covered by the tests, new tests have been added.
-----
2 changes: 1 addition & 1 deletion .github/workflows/frogbot-scan-pr-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"
# Setup Gradle is needed only in case that Gradle wrapper isn't used.
# - name: Setup Gradle
# uses: gradle/gradle-build-action@v2
Expand Down
74 changes: 47 additions & 27 deletions .github/workflows/integrationTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -76,7 +76,13 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -120,11 +126,13 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
- name: Install Go
uses: actions/setup-go@v3
distribution: "zulu"

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.19.x
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
Expand All @@ -150,7 +158,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-13, windows-latest ]
runs-on: ${{ matrix.os }}
env:
GRADLE_OPTS: -Dorg.gradle.daemon=false
Expand All @@ -164,11 +172,13 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
- name: Install Go
uses: actions/setup-go@v3
distribution: "zulu"

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.19.x
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -210,7 +220,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -244,7 +254,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Cache local Maven repository
uses: actions/cache@v3
Expand All @@ -266,7 +276,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-13, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand All @@ -284,11 +294,13 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
- name: Install Go
uses: actions/setup-go@v3
distribution: "zulu"

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.19.x
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -321,7 +333,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-13, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand All @@ -330,9 +342,9 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: Install NuGet
uses: nuget/setup-nuget@v1
uses: nuget/setup-nuget@v2
with:
nuget-version: 5.x
nuget-version: 6.x
- name: Install dotnet
uses: actions/setup-dotnet@v2
with:
Expand All @@ -341,11 +353,13 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
- name: Install Go
uses: actions/setup-go@v3
distribution: "zulu"

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.19.x
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down Expand Up @@ -387,14 +401,20 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"
- name: Setup Python3
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Setup Virtualenv
run: python -m venv env

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: 1.22.x
cache: false

- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -433,7 +453,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Cache local Maven repository
uses: actions/cache@v3
Expand Down

0 comments on commit 9fc1247

Please sign in to comment.