Skip to content

Commit

Permalink
Fix tests (jfrog#2801)
Browse files Browse the repository at this point in the history
  • Loading branch information
EyalDelarea authored Dec 30, 2024
1 parent cb37b3f commit ca7c705
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/nugetTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ jobs:
sudo apt-get update
sudo apt-get install -y mono-complete
- name: Install NuGet
uses: nuget/setup-nuget@v2
with:
nuget-version: '6.x'

- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'

- name: Install NuGet
uses: nuget/setup-nuget@v2
with:
nuget-version: '6.x'

- name: Setup Go with cache
uses: jfrog/.github/actions/install-go-with-cache@main

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scriptTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- os: "macos-latest"

- os: "macos-12"
- os: "macos-13"

- os: "windows-latest"
osSuffix: ".exe"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/transferTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ jobs:
Transfer-Artifactory-6-Tests:
if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
name: artifactory-6
runs-on: ubuntu-latest
# Fixed runner image to set the java tools needed for artifactory 6
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion pip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,11 @@ func testPipCmd(t *testing.T, projectPath, buildNumber, module string, expectedD
func assertDependenciesRequestedByAndChecksums(t *testing.T, module buildinfo.Module, moduleName string) {
for _, dependency := range module.Dependencies {
assertDependencyChecksums(t, dependency.Checksum)
// Note: Sub-dependency versions may vary because root dependencies can specify version ranges (e.g., >=1.0.0) for their sub-dependencies.
switch dependency.Id {
case "pyyaml:5.1.2", "nltk:3.4.5", "macholib:1.11":
assert.EqualValues(t, [][]string{{moduleName}}, dependency.RequestedBy)
case "six:1.16.0":
case "six:1.17.0":
assert.EqualValues(t, [][]string{{"nltk:3.4.5", moduleName}}, dependency.RequestedBy)
default:
// Altgraph version can change
Expand Down

0 comments on commit ca7c705

Please sign in to comment.