Skip to content

Commit 8dce45f

Browse files
CopilotCopilot
authored
Merge remote-tracking branch 'origin/main' into depsfix
# Conflicts: # .licenses/npm/@nodable/entities.dep.yml # .licenses/npm/anynum.dep.yml # .licenses/npm/fast-xml-parser.dep.yml # .licenses/npm/strnum.dep.yml # .licenses/npm/xml-naming.dep.yml # dist/cache-save/index.js # dist/setup/index.js # package-lock.json
2 parents 98755c4 + 8f639b1 commit 8dce45f

20 files changed

Lines changed: 12737 additions & 7040 deletions

‎.licenses/npm/@actions/cache.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/@nodable/entities.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/anynum.dep.yml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/fast-xml-builder.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/fast-xml-parser.dep.yml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/is-unsafe.dep.yml‎

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/strnum.dep.yml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/xml-naming.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎__tests__/cache-restore.test.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,12 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
190190

191191
restoredKeys.forEach(restoredKey => {
192192
if (restoredKey) {
193-
if (process.platform === 'linux' && packageManager === 'pip') {
194-
expect(infoSpy).toHaveBeenCalledWith(
195-
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-20.04-Ubuntu-python-${pythonVersion}-${packageManager}-${fileHash}`
196-
);
197-
} else if (packageManager === 'poetry') {
198-
expect(infoSpy).toHaveBeenCalledWith(
199-
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-python-${pythonVersion}-${packageManager}-v2-${fileHash}`
200-
);
201-
} else {
202-
expect(infoSpy).toHaveBeenCalledWith(
203-
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-python-${pythonVersion}-${packageManager}-${fileHash}`
204-
);
205-
}
193+
const osSegment =
194+
process.platform === 'linux' ? '-20.04-Ubuntu' : '';
195+
const versionSuffix = packageManager === 'poetry' ? '-v2' : '';
196+
expect(infoSpy).toHaveBeenCalledWith(
197+
`Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${pythonVersion}-${packageManager}${versionSuffix}-${fileHash}`
198+
);
206199
} else {
207200
expect(infoSpy).toHaveBeenCalledWith(
208201
`${packageManager} cache is not found`

0 commit comments

Comments
 (0)