Skip to content

Commit ca7c705

Browse files
authored
Fix tests (#2801)
1 parent cb37b3f commit ca7c705

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/nugetTests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ jobs:
4141
sudo apt-get update
4242
sudo apt-get install -y mono-complete
4343
44-
- name: Install NuGet
45-
uses: nuget/setup-nuget@v2
46-
with:
47-
nuget-version: '6.x'
48-
4944
- name: Install .NET
5045
uses: actions/setup-dotnet@v4
5146
with:
5247
dotnet-version: '6.x'
5348

49+
- name: Install NuGet
50+
uses: nuget/setup-nuget@v2
51+
with:
52+
nuget-version: '6.x'
53+
5454
- name: Setup Go with cache
5555
uses: jfrog/.github/actions/install-go-with-cache@main
5656

.github/workflows/scriptTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- os: "macos-latest"
2828

29-
- os: "macos-12"
29+
- os: "macos-13"
3030

3131
- os: "windows-latest"
3232
osSuffix: ".exe"

.github/workflows/transferTests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
Transfer-Artifactory-6-Tests:
4343
if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
4444
name: artifactory-6
45-
runs-on: ubuntu-latest
45+
# Fixed runner image to set the java tools needed for artifactory 6
46+
runs-on: ubuntu-20.04
4647
steps:
4748
- name: Checkout code
4849
uses: actions/checkout@v4

pip_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,11 @@ func testPipCmd(t *testing.T, projectPath, buildNumber, module string, expectedD
141141
func assertDependenciesRequestedByAndChecksums(t *testing.T, module buildinfo.Module, moduleName string) {
142142
for _, dependency := range module.Dependencies {
143143
assertDependencyChecksums(t, dependency.Checksum)
144+
// Note: Sub-dependency versions may vary because root dependencies can specify version ranges (e.g., >=1.0.0) for their sub-dependencies.
144145
switch dependency.Id {
145146
case "pyyaml:5.1.2", "nltk:3.4.5", "macholib:1.11":
146147
assert.EqualValues(t, [][]string{{moduleName}}, dependency.RequestedBy)
147-
case "six:1.16.0":
148+
case "six:1.17.0":
148149
assert.EqualValues(t, [][]string{{"nltk:3.4.5", moduleName}}, dependency.RequestedBy)
149150
default:
150151
// Altgraph version can change

0 commit comments

Comments
 (0)