actions/setup-pdm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: post action run even if cache is false (#24)

Browse Source
This commit is contained in:
Frost Ming 2022-10-21 22:17:30 +08:00 committed by GitHub
parent 5f2990033f
commit ed9b6c5626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 144 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
dist/cache-save.js vendored
View File

@ -2068,7 +2068,7 @@ var require_core = __commonJS({
process.env["PATH"] = `${inputPath}${path.delimiter}${process.env["PATH"]}`;
}
exports.addPath = addPath;
function getInput2(name, options) {
function getInput(name, options) {
const val = process.env[`INPUT_${name.replace(/ /g, "_").toUpperCase()}`] || "";
if (options && options.required && !val) {
throw new Error(`Input required and not supplied: ${name}`);
@ -2078,19 +2078,19 @@ var require_core = __commonJS({
}
return val.trim();
}
exports.getInput = getInput2;
exports.getInput = getInput;
function getMultilineInput(name, options) {
const inputs = getInput2(name, options).split("\n").filter((x) => x !== "");
const inputs = getInput(name, options).split("\n").filter((x) => x !== "");
if (options && options.trimWhitespace === false) {
return inputs;
}
return inputs.map((input) => input.trim());
}
exports.getMultilineInput = getMultilineInput;
function getBooleanInput(name, options) {
function getBooleanInput2(name, options) {
const trueValue = ["true", "True", "TRUE"];
const falseValue = ["false", "False", "FALSE"];
const val = getInput2(name, options);
const val = getInput(name, options);
if (trueValue.includes(val))
return true;
if (falseValue.includes(val))
@ -2098,7 +2098,7 @@ var require_core = __commonJS({
throw new TypeError(`Input does not meet YAML 1.2 "Core Schema" specification: ${name}
Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
}
exports.getBooleanInput = getBooleanInput;
exports.getBooleanInput = getBooleanInput2;
function setOutput(name, value) {
const filePath = process.env["GITHUB_OUTPUT"] || "";
if (filePath) {
@ -43712,9 +43712,9 @@ var require_dist9 = __commonJS({
}
});
// node_modules/.pnpm/@azure+storage-blob@12.11.0/node_modules/@azure/storage-blob/dist/index.js
// node_modules/.pnpm/@azure+storage-blob@12.12.0/node_modules/@azure/storage-blob/dist/index.js
var require_dist10 = __commonJS({
"node_modules/.pnpm/@azure+storage-blob@12.11.0/node_modules/@azure/storage-blob/dist/index.js"(exports) {
"node_modules/.pnpm/@azure+storage-blob@12.12.0/node_modules/@azure/storage-blob/dist/index.js"(exports) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var coreHttp = require_dist7();
@ -52196,7 +52196,7 @@ var require_dist10 = __commonJS({
var version = {
parameterPath: "version",
mapper: {
defaultValue: "2021-08-06",
defaultValue: "2021-10-04",
isConstant: true,
serializedName: "x-ms-version",
type: {
@ -56498,14 +56498,15 @@ var require_dist10 = __commonJS({
serializer: xmlSerializer
};
var logger = logger$1.createClientLogger("storage-blob");
var SDK_VERSION = "12.11.0";
var SERVICE_VERSION = "2021-08-06";
var SDK_VERSION = "12.12.0";
var SERVICE_VERSION = "2021-10-04";
var BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES = 256 * 1024 * 1024;
var BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES = 4e3 * 1024 * 1024;
var BLOCK_BLOB_MAX_BLOCKS = 5e4;
var DEFAULT_BLOCK_BUFFER_SIZE_BYTES = 8 * 1024 * 1024;
var DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES = 4 * 1024 * 1024;
var DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS = 5;
var REQUEST_TIMEOUT = 100 * 1e3;
var StorageOAuthScopes = "https://storage.azure.com/.default";
var URLConstants = {
Parameters: {
@ -56690,6 +56691,28 @@ var require_dist10 = __commonJS({
];
var BlobUsesCustomerSpecifiedEncryptionMsg = "BlobUsesCustomerSpecifiedEncryption";
var BlobDoesNotUseCustomerSpecifiedEncryption = "BlobDoesNotUseCustomerSpecifiedEncryption";
var PathStylePorts = [
"10000",
"10001",
"10002",
"10003",
"10004",
"10100",
"10101",
"10102",
"10103",
"10104",
"11000",
"11001",
"11002",
"11003",
"11004",
"11100",
"11101",
"11102",
"11103",
"11104"
];
function escapeURLPath(url2) {
const urlParsed = coreHttp.URLBuilder.parse(url2);
let path = urlParsed.getPath();
@ -56924,7 +56947,7 @@ var require_dist10 = __commonJS({
return false;
}
const host = parsedUrl.getHost() + (parsedUrl.getPort() === void 0 ? "" : ":" + parsedUrl.getPort());
return /^.*:.*:.*$|^localhost(:[0-9]+)?$|^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])){3}(:[0-9]+)?$/.test(host);
return /^.*:.*:.*$|^localhost(:[0-9]+)?$|^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])){3}(:[0-9]+)?$/.test(host) || parsedUrl.getPort() !== void 0 && PathStylePorts.includes(parsedUrl.getPort());
}
function toBlobTagsString(tags2) {
if (tags2 === void 0) {
@ -57404,6 +57427,13 @@ var require_dist10 = __commonJS({
};
}
}
function EscapePath(blobName) {
const split = blobName.split("/");
for (let i = 0; i < split.length; i++) {
split[i] = encodeURIComponent(split[i]);
}
return split.join("/");
}
var StorageBrowserPolicy = class extends coreHttp.BaseRequestPolicy {
constructor(nextPolicy, options) {
super(nextPolicy, options);
@ -57902,7 +57932,7 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
}
};
var packageName = "azure-storage-blob";
var packageVersion = "12.11.0";
var packageVersion = "12.12.0";
var StorageClientContext = class extends coreHttp__namespace.ServiceClient {
constructor(url2, options) {
if (url2 === void 0) {
@ -57919,7 +57949,7 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
this.requestContentType = "application/json; charset=utf-8";
this.baseUri = options.endpoint || "{url}";
this.url = url2;
this.version = options.version || "2021-08-06";
this.version = options.version || "2021-10-04";
}
};
var StorageClient = class {
@ -60268,8 +60298,10 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
let pos = 0;
const count = end - offset;
return new Promise((resolve, reject) => {
const timeout = setTimeout(() => reject(new Error(`The operation cannot be completed in timeout.`)), REQUEST_TIMEOUT);
stream2.on("readable", () => {
if (pos >= count) {
clearTimeout(timeout);
resolve();
return;
}
@ -60285,12 +60317,16 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
pos += chunkLength;
});
stream2.on("end", () => {
clearTimeout(timeout);
if (pos < count) {
reject(new Error(`Stream drains before getting enough data needed. Data read: ${pos}, data need: ${count}`));
}
resolve();
});
stream2.on("error", reject);
stream2.on("error", (msg) => {
clearTimeout(timeout);
reject(msg);
});
});
}
async function streamToBuffer2(stream2, buffer, encoding) {
@ -62349,16 +62385,16 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
}
}
getBlobClient(blobName) {
return new BlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new BlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getAppendBlobClient(blobName) {
return new AppendBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new AppendBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getBlockBlobClient(blobName) {
return new BlockBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new BlockBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getPageBlobClient(blobName) {
return new PageBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new PageBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
async getProperties(options = {}) {
if (!options.conditions) {
@ -64641,7 +64677,7 @@ var import_fs = __toESM(require("fs"));
function run() {
return __async(this, null, function* () {
try {
const cache2 = core.getInput("cache");
const cache2 = core.getBooleanInput("cache");
if (cache2) {
yield saveCache2();
}
@ -64656,11 +64692,7 @@ function saveCache2() {
const cachePaths = JSON.parse(core.getState("cache-paths"));
core.debug(`paths for caching are ${cachePaths.join(", ")}`);
if (cachePaths.every((path) => !import_fs.default.existsSync(path))) {
throw new Error(
`Cache folder path is retrieved for pdm but doesn't exist on disk: ${cachePaths.join(
", "
)}`
);
throw new Error(`Cache folder path is retrieved for pdm but doesn't exist on disk: ${cachePaths.join(", ")}`);
}
const primaryKey = core.getState("cache-primary-key");
const matchedKey = core.getState("cache-matched-key");
@ -64668,9 +64700,7 @@ function saveCache2() {
core.warning("Error retrieving key from state.");
return;
} else if (matchedKey === primaryKey) {
core.info(
`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`
);
core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
return;
}
const cacheId = yield cache.saveCache(cachePaths, primaryKey);

62
dist/setup-pdm.js vendored
View File

@ -43712,9 +43712,9 @@ var require_dist9 = __commonJS({
}
});
// node_modules/.pnpm/@azure+storage-blob@12.11.0/node_modules/@azure/storage-blob/dist/index.js
// node_modules/.pnpm/@azure+storage-blob@12.12.0/node_modules/@azure/storage-blob/dist/index.js
var require_dist10 = __commonJS({
"node_modules/.pnpm/@azure+storage-blob@12.11.0/node_modules/@azure/storage-blob/dist/index.js"(exports) {
"node_modules/.pnpm/@azure+storage-blob@12.12.0/node_modules/@azure/storage-blob/dist/index.js"(exports) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var coreHttp = require_dist7();
@ -52196,7 +52196,7 @@ var require_dist10 = __commonJS({
var version = {
parameterPath: "version",
mapper: {
defaultValue: "2021-08-06",
defaultValue: "2021-10-04",
isConstant: true,
serializedName: "x-ms-version",
type: {
@ -56498,14 +56498,15 @@ var require_dist10 = __commonJS({
serializer: xmlSerializer
};
var logger = logger$1.createClientLogger("storage-blob");
var SDK_VERSION = "12.11.0";
var SERVICE_VERSION = "2021-08-06";
var SDK_VERSION = "12.12.0";
var SERVICE_VERSION = "2021-10-04";
var BLOCK_BLOB_MAX_UPLOAD_BLOB_BYTES = 256 * 1024 * 1024;
var BLOCK_BLOB_MAX_STAGE_BLOCK_BYTES = 4e3 * 1024 * 1024;
var BLOCK_BLOB_MAX_BLOCKS = 5e4;
var DEFAULT_BLOCK_BUFFER_SIZE_BYTES = 8 * 1024 * 1024;
var DEFAULT_BLOB_DOWNLOAD_BLOCK_BYTES = 4 * 1024 * 1024;
var DEFAULT_MAX_DOWNLOAD_RETRY_REQUESTS = 5;
var REQUEST_TIMEOUT = 100 * 1e3;
var StorageOAuthScopes = "https://storage.azure.com/.default";
var URLConstants = {
Parameters: {
@ -56690,6 +56691,28 @@ var require_dist10 = __commonJS({
];
var BlobUsesCustomerSpecifiedEncryptionMsg = "BlobUsesCustomerSpecifiedEncryption";
var BlobDoesNotUseCustomerSpecifiedEncryption = "BlobDoesNotUseCustomerSpecifiedEncryption";
var PathStylePorts = [
"10000",
"10001",
"10002",
"10003",
"10004",
"10100",
"10101",
"10102",
"10103",
"10104",
"11000",
"11001",
"11002",
"11003",
"11004",
"11100",
"11101",
"11102",
"11103",
"11104"
];
function escapeURLPath(url2) {
const urlParsed = coreHttp.URLBuilder.parse(url2);
let path8 = urlParsed.getPath();
@ -56924,7 +56947,7 @@ var require_dist10 = __commonJS({
return false;
}
const host = parsedUrl.getHost() + (parsedUrl.getPort() === void 0 ? "" : ":" + parsedUrl.getPort());
return /^.*:.*:.*$|^localhost(:[0-9]+)?$|^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])){3}(:[0-9]+)?$/.test(host);
return /^.*:.*:.*$|^localhost(:[0-9]+)?$|^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])){3}(:[0-9]+)?$/.test(host) || parsedUrl.getPort() !== void 0 && PathStylePorts.includes(parsedUrl.getPort());
}
function toBlobTagsString(tags2) {
if (tags2 === void 0) {
@ -57404,6 +57427,13 @@ var require_dist10 = __commonJS({
};
}
}
function EscapePath(blobName) {
const split = blobName.split("/");
for (let i = 0; i < split.length; i++) {
split[i] = encodeURIComponent(split[i]);
}
return split.join("/");
}
var StorageBrowserPolicy = class extends coreHttp.BaseRequestPolicy {
constructor(nextPolicy, options) {
super(nextPolicy, options);
@ -57902,7 +57932,7 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
}
};
var packageName = "azure-storage-blob";
var packageVersion = "12.11.0";
var packageVersion = "12.12.0";
var StorageClientContext = class extends coreHttp__namespace.ServiceClient {
constructor(url2, options) {
if (url2 === void 0) {
@ -57919,7 +57949,7 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
this.requestContentType = "application/json; charset=utf-8";
this.baseUri = options.endpoint || "{url}";
this.url = url2;
this.version = options.version || "2021-08-06";
this.version = options.version || "2021-10-04";
}
};
var StorageClient = class {
@ -60268,8 +60298,10 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
let pos = 0;
const count = end - offset;
return new Promise((resolve, reject) => {
const timeout = setTimeout(() => reject(new Error(`The operation cannot be completed in timeout.`)), REQUEST_TIMEOUT);
stream3.on("readable", () => {
if (pos >= count) {
clearTimeout(timeout);
resolve();
return;
}
@ -60285,12 +60317,16 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
pos += chunkLength;
});
stream3.on("end", () => {
clearTimeout(timeout);
if (pos < count) {
reject(new Error(`Stream drains before getting enough data needed. Data read: ${pos}, data need: ${count}`));
}
resolve();
});
stream3.on("error", reject);
stream3.on("error", (msg) => {
clearTimeout(timeout);
reject(msg);
});
});
}
async function streamToBuffer2(stream3, buffer, encoding) {
@ -62349,16 +62385,16 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`;
}
}
getBlobClient(blobName) {
return new BlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new BlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getAppendBlobClient(blobName) {
return new AppendBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new AppendBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getBlockBlobClient(blobName) {
return new BlockBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new BlockBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
getPageBlobClient(blobName) {
return new PageBlobClient(appendToURLPath(this.url, encodeURIComponent(blobName)), this.pipeline);
return new PageBlobClient(appendToURLPath(this.url, EscapePath(blobName)), this.pipeline);
}
async getProperties(options = {}) {
if (!options.conditions) {

15
src/cache-save.ts
View File

@ -2,10 +2,9 @@ import * as core from '@actions/core';
import * as cache from '@actions/cache';
import fs from 'fs';
async function run() {
try {
const cache = core.getInput('cache');
const cache = core.getBooleanInput('cache');
if (cache) {
await saveCache();
}
@ -20,12 +19,8 @@ async function saveCache() {
core.debug(`paths for caching are ${cachePaths.join(', ')}`);
if (cachePaths.every(path => !fs.existsSync(path))) {
throw new Error(
`Cache folder path is retrieved for pdm but doesn't exist on disk: ${cachePaths.join(
', '
)}`
);
if (cachePaths.every((path) => !fs.existsSync(path))) {
throw new Error(`Cache folder path is retrieved for pdm but doesn't exist on disk: ${cachePaths.join(', ')}`);
}
const primaryKey = core.getState('cache-primary-key');
@ -36,9 +31,7 @@ async function saveCache() {
return;
} else if (matchedKey === primaryKey) {
// no change in target directories
core.info(
`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`
);
core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
return;
}

66
src/setup-pdm.ts
View File

@ -1,13 +1,13 @@
import * as os from 'os'
import path from 'path'
import * as core from '@actions/core'
import { exec } from '@actions/exec'
import { IS_WINDOWS } from 'setup-python/src/utils'
import semParse from 'semver/functions/parse'
import * as utils from './utils'
import { cacheDependencies } from './caches'
import * as os from 'os';
import path from 'path';
import * as core from '@actions/core';
import { exec } from '@actions/exec';
import { IS_WINDOWS } from 'setup-python/src/utils';
import semParse from 'semver/functions/parse';
import * as utils from './utils';
import { cacheDependencies } from './caches';
const INSTALL_SCRIPT_URL = 'https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py'
const INSTALL_SCRIPT_URL = 'https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py';
interface InstallOutput {
pdm_version: string;
pdm_bin: string;
@ -16,53 +16,53 @@ interface InstallOutput {
}
function getPep582Path(installDir: string, pythonVersion: string): string {
const parsedVersion = semParse(pythonVersion)!
const parsedVersion = semParse(pythonVersion)!;
if (IS_WINDOWS) {
return path.resolve(installDir, 'Lib/site-packages/pdm/pep582')
return path.resolve(installDir, 'Lib/site-packages/pdm/pep582');
} else {
return path.resolve(installDir, 'lib', `python${parsedVersion.major}.${parsedVersion.minor}`, 'site-packages/pdm/pep582')
return path.resolve(installDir, 'lib', `python${parsedVersion.major}.${parsedVersion.minor}`, 'site-packages/pdm/pep582');
}
}
async function run(): Promise<void> {
const arch = core.getInput('architecture') || os.arch()
const pdmVersion = core.getInput('version')
const pythonVersion = core.getInput('python-version')
const cmdArgs = ['-']
const arch = core.getInput('architecture') || os.arch();
const pdmVersion = core.getInput('version');
const pythonVersion = core.getInput('python-version');
const cmdArgs = ['-'];
if (core.getBooleanInput('prerelease')) {
cmdArgs.push('--prerelease')
cmdArgs.push('--prerelease');
}
if (pdmVersion) {
cmdArgs.push('--version', pdmVersion)
cmdArgs.push('--version', pdmVersion);
}
cmdArgs.push('-o', 'install-output.json')
cmdArgs.push('-o', 'install-output.json');
// Use the default python version installed with the runner
try {
await exec('python', cmdArgs, { input: await utils.fetchUrlAsBuffer(INSTALL_SCRIPT_URL) })
const installOutput: InstallOutput = JSON.parse(await utils.readFile('install-output.json'))
core.debug(`Install output: ${installOutput}`)
core.setOutput('pdm-version', installOutput.pdm_version)
core.setOutput('pdm-bin', path.join(installOutput.install_location, installOutput.pdm_bin))
core.addPath(path.dirname(installOutput.pdm_bin))
await exec('python', cmdArgs, { input: await utils.fetchUrlAsBuffer(INSTALL_SCRIPT_URL) });
const installOutput: InstallOutput = JSON.parse(await utils.readFile('install-output.json'));
core.debug(`Install output: ${installOutput}`);
core.setOutput('pdm-version', installOutput.pdm_version);
core.setOutput('pdm-bin', path.join(installOutput.install_location, installOutput.pdm_bin));
core.addPath(path.dirname(installOutput.pdm_bin));
if (core.getBooleanInput('enable-pep582')) {
core.exportVariable('PYTHONPATH', getPep582Path(installOutput.install_location, installOutput.install_python_version))
core.exportVariable('PYTHONPATH', getPep582Path(installOutput.install_location, installOutput.install_python_version));
}
const installedPython = await utils.findPythonVersion(pythonVersion, arch)
const installedPython = await utils.findPythonVersion(pythonVersion, arch);
if (process.platform === 'linux') {
// See https://github.com/actions/virtual-environments/issues/2803
core.exportVariable('LD_PRELOAD', '/lib/x86_64-linux-gnu/libgcc_s.so.1')
core.exportVariable('LD_PRELOAD', '/lib/x86_64-linux-gnu/libgcc_s.so.1');
}
core.info(`Successfully setup ${installOutput.pdm_version} with Python ${installedPython}`)
const matchersPath = path.join(__dirname, '..', '.github')
core.info(`##[add-matcher]${path.join(matchersPath, 'python.json')}`)
core.info(`Successfully setup ${installOutput.pdm_version} with Python ${installedPython}`);
const matchersPath = path.join(__dirname, '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'python.json')}`);
if (utils.isCacheAvailable()) {
await cacheDependencies(installOutput.pdm_bin, installedPython);
}
} catch (error: any) {
core.setFailed(error.message)
core.setFailed(error.message);
}
}
run()
run();