diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 98ca0e586..d71fdf0ab 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -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 diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 916d25562..835783b3c 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -26,7 +26,7 @@ jobs: - os: "macos-latest" - - os: "macos-12" + - os: "macos-13" - os: "windows-latest" osSuffix: ".exe" diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index 9e061137c..f61f3b2a7 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -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 diff --git a/pip_test.go b/pip_test.go index c4199eded..43a583f67 100644 --- a/pip_test.go +++ b/pip_test.go @@ -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