15 Commits
Author SHA1 Message Date
Renée Kooi 41ae19e72e 1.3.0 2020-11-11 12:44:03 +01:00
Automated d9392a17cf Rebuild 2020-11-11 11:40:36 +00:00
Renée Kooi e3c946d422 try with newer zig 2020-11-11 12:40:03 +01:00
Renée Kooi d485d46e15 add tests for version to URL resolution 2020-11-11 12:38:41 +01:00
Renée Kooi ab441cce53 refactor 2020-11-11 12:27:49 +01:00
Renée Kooi a43b52f8f8 add commit hash syntax to readme 2020-11-11 12:17:26 +01:00
Code Hz 96923a5a7f allow use exact commit hash (#13) (#14) 2020-11-11 12:15:17 +01:00
dependabot-preview[bot] 945e912039 Bump standard from 15.0.1 to 16.0.1 (#16)
Bumps [standard](https://github.com/standard/standard) from 15.0.1 to 16.0.1.
- [Release notes](https://github.com/standard/standard/releases)
- [Changelog](https://github.com/standard/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/standard/compare/v15.0.1...v16.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-11-06 13:44:49 +01:00
Automated 24b561a760 Rebuild 2020-11-06 12:41:24 +00:00
dependabot-preview[bot] 694a6a80cf Bump @vercel/ncc from 0.24.1 to 0.25.0 (#17)
Bumps [@vercel/ncc](https://github.com/vercel/ncc) from 0.24.1 to 0.25.0.
- [Release notes](https://github.com/vercel/ncc/releases)
- [Commits](https://github.com/vercel/ncc/compare/0.24.1...0.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-11-06 13:40:47 +01:00
Automated 5360ef6587 Rebuild 2020-10-22 16:03:35 +00:00
dependabot-preview[bot] 633f3dcdd7 Bump standard from 14.3.4 to 15.0.0 (#12)
Bumps [standard](https://github.com/standard/standard) from 14.3.4 to 15.0.0.
- [Release notes](https://github.com/standard/standard/releases)
- [Changelog](https://github.com/standard/standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/standard/compare/v14.3.4...v15.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-10-22 18:03:04 +02:00
Renée Kooi 7d7611829d 1.2.5 2020-10-11 18:21:10 +02:00
Automated 94c7f0924b Rebuild 2020-10-11 16:18:31 +00:00
Renée Kooi 1956e0fd25 trigger rebuild 2020-10-11 18:17:51 +02:00
8 changed files with 364 additions and 149 deletions
+16 -11
View File
@@ -1,26 +1,31 @@
name: CI name: CI
on: push on: push
jobs: jobs:
lint: test:
name: Unit tests
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - name: Checkout sources
- uses: goto-bus-stop/standard-action@v1 uses: actions/checkout@v2
with: - name: Install dependencies
annotate: true run: npm install
env: - name: Run tests
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} run: npm test
smoke-test: smoke-test:
name: Build test
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
zig-version: [0.5.0, master] zig-version: [0.5.0, 0.7.0, master]
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v2 - name: Checkout sources
- uses: goto-bus-stop/setup-zig@default uses: actions/checkout@v2
- name: Install Zig
uses: goto-bus-stop/setup-zig@default
with: with:
version: ${{matrix.zig-version}} version: ${{matrix.zig-version}}
- run: zig build test - name: Run tests
run: zig build test
working-directory: test working-directory: test
+13 -1
View File
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## 1.3.0
* Support pinning to a specific commit of the zig compiler. ([@codehz](https://github.com/codehz) in [#14](https://github.com/goto-bus-stop/setup-zig/pull/14))
```yaml
uses: goto-bus-stop/setup-zig@v1
with:
version: 0.6.0+4b48fccad
```
* Add tests for the version -> URL resolution code.
## 1.2.5
* Update dependencies to fix #11.
## 1.2.4 ## 1.2.4
* Update dependencies simple-get and ncc. * Update dependencies simple-get and ncc.
@@ -11,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
* Configure Actions to build releases automatically. * Configure Actions to build releases automatically.
## 1.2.2 ## 1.2.2
* Update examples. (#7) * Update examples. ([#7](https://github.com/goto-bus-stop/setup-zig/pull/7))
* Upgrade dependencies. * Upgrade dependencies.
* Recommend using @v1 instead of pinning to a version. * Recommend using @v1 instead of pinning to a version.
+10 -3
View File
@@ -1,6 +1,6 @@
# setup-zig # setup-zig
Use the zig compiler in your Github Action Use the zig compiler in your Github Actions workflows
[Usage](#usage) - [License: Apache-2.0](#license) [Usage](#usage) - [License: Apache-2.0](#license)
@@ -31,7 +31,7 @@ Optionally set a Zig version:
```yaml ```yaml
- uses: goto-bus-stop/setup-zig@v1 - uses: goto-bus-stop/setup-zig@v1
with: with:
version: 0.4.0 # The default is 0.5.0 version: 0.7.0 # The default is 0.5.0
``` ```
To use the nightly builds, set: To use the nightly builds, set:
@@ -41,7 +41,14 @@ To use the nightly builds, set:
version: master version: master
``` ```
If you are running Zig on Windows machines, you need to make sure that your .zig files use \n line endings and not \r\n. The `actions/checkout` action auto-converts line endings to \r\n, so add a `.gitattributes` file: Or [pin to a specific commit](https://github.com/goto-bus-stop/setup-zig/issues/13) using `version+commithash` syntax:
```yaml
- uses: goto-bus-stop/setup-zig@v1
with:
version: 0.6.0+4b48fccad
```
If you are running Zig on Windows machines, you need to make sure that your .zig files use \n line endings and not \r\n. The `actions/checkout` action auto-converts line endings to `\r\n` on Windows runners, so add a `.gitattributes` file:
``` ```
*.zig text eol=lf *.zig text eol=lf
``` ```
+206 -89
View File
@@ -8,49 +8,22 @@ module.exports =
const os = __webpack_require__(2087) const os = __webpack_require__(2087)
const path = __webpack_require__(5622) const path = __webpack_require__(5622)
const semver = __webpack_require__(1383) const semver = __webpack_require__(1383)
const get = __webpack_require__(2522).concat
const actions = __webpack_require__(2186) const actions = __webpack_require__(2186)
const cache = __webpack_require__(7784) const cache = __webpack_require__(7784)
const {
extForPlatform,
resolveCommit,
resolveVersion
} = __webpack_require__(3470)
function getJSON (opts) { async function downloadZig (platform, version) {
return new Promise((resolve, reject) => { const ext = extForPlatform(platform)
get({ ...opts, json: true }, (err, req, data) => {
if (err) {
reject(err)
} else {
resolve(data)
}
})
})
}
async function downloadZig (version) { const { downloadUrl, variantName } = version.includes('+')
const host = { ? resolveCommit(platform, version)
linux: 'x86_64-linux', : await resolveVersion(platform, version)
darwin: 'x86_64-macos',
win32: 'x86_64-windows'
}[os.platform()] || os.platform()
const ext = {
linux: 'tar.xz',
darwin: 'tar.xz',
win32: 'zip'
}[os.platform()]
const index = await getJSON({ url: 'https://ziglang.org/download/index.json' }) const downloadPath = await cache.downloadTool(downloadUrl)
const availableVersions = Object.keys(index)
const useVersion = semver.valid(version)
? semver.maxSatisfying(availableVersions.filter((v) => semver.valid(v)), version)
: null
const meta = index[useVersion || version]
if (!meta || !meta[host]) {
throw new Error(`Could not find version ${version} for platform ${host}`)
}
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
const downloadPath = await cache.downloadTool(meta[host].tarball)
const zigPath = ext === 'zip' const zigPath = ext === 'zip'
? await cache.extractZip(downloadPath) ? await cache.extractZip(downloadPath)
: await cache.extractTar(downloadPath, undefined, 'x') : await cache.extractTar(downloadPath, undefined, 'x')
@@ -70,7 +43,7 @@ async function main () {
let zigPath = cache.find('zig', version) let zigPath = cache.find('zig', version)
if (!zigPath) { if (!zigPath) {
zigPath = await downloadZig(version) zigPath = await downloadZig(os.platform(), version)
} }
// Add the `zig` binary to the $PATH // Add the `zig` binary to the $PATH
@@ -100,6 +73,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
const os = __importStar(__webpack_require__(2087)); const os = __importStar(__webpack_require__(2087));
const utils_1 = __webpack_require__(5278);
/** /**
* Commands * Commands
* *
@@ -153,28 +127,14 @@ class Command {
return cmdStr; return cmdStr;
} }
} }
/**
* Sanitizes an input into a string so it can be passed into issueCommand safely
* @param input input to sanitize into a string
*/
function toCommandValue(input) {
if (input === null || input === undefined) {
return '';
}
else if (typeof input === 'string' || input instanceof String) {
return input;
}
return JSON.stringify(input);
}
exports.toCommandValue = toCommandValue;
function escapeData(s) { function escapeData(s) {
return toCommandValue(s) return utils_1.toCommandValue(s)
.replace(/%/g, '%25') .replace(/%/g, '%25')
.replace(/\r/g, '%0D') .replace(/\r/g, '%0D')
.replace(/\n/g, '%0A'); .replace(/\n/g, '%0A');
} }
function escapeProperty(s) { function escapeProperty(s) {
return toCommandValue(s) return utils_1.toCommandValue(s)
.replace(/%/g, '%25') .replace(/%/g, '%25')
.replace(/\r/g, '%0D') .replace(/\r/g, '%0D')
.replace(/\n/g, '%0A') .replace(/\n/g, '%0A')
@@ -208,6 +168,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
const command_1 = __webpack_require__(7351); const command_1 = __webpack_require__(7351);
const file_command_1 = __webpack_require__(717);
const utils_1 = __webpack_require__(5278);
const os = __importStar(__webpack_require__(2087)); const os = __importStar(__webpack_require__(2087));
const path = __importStar(__webpack_require__(5622)); const path = __importStar(__webpack_require__(5622));
/** /**
@@ -234,9 +196,17 @@ var ExitCode;
*/ */
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
function exportVariable(name, val) { function exportVariable(name, val) {
const convertedVal = command_1.toCommandValue(val); const convertedVal = utils_1.toCommandValue(val);
process.env[name] = convertedVal; process.env[name] = convertedVal;
const filePath = process.env['GITHUB_ENV'] || '';
if (filePath) {
const delimiter = '_GitHubActionsFileCommandDelimeter_';
const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
file_command_1.issueCommand('ENV', commandValue);
}
else {
command_1.issueCommand('set-env', { name }, convertedVal); command_1.issueCommand('set-env', { name }, convertedVal);
}
} }
exports.exportVariable = exportVariable; exports.exportVariable = exportVariable;
/** /**
@@ -252,7 +222,13 @@ exports.setSecret = setSecret;
* @param inputPath * @param inputPath
*/ */
function addPath(inputPath) { function addPath(inputPath) {
const filePath = process.env['GITHUB_PATH'] || '';
if (filePath) {
file_command_1.issueCommand('PATH', inputPath);
}
else {
command_1.issueCommand('add-path', {}, inputPath); command_1.issueCommand('add-path', {}, inputPath);
}
process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`; process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
} }
exports.addPath = addPath; exports.addPath = addPath;
@@ -414,6 +390,68 @@ exports.getState = getState;
/***/ }), /***/ }),
/***/ 717:
/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
"use strict";
// For internal use, subject to change.
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
// We use any as a valid input type
/* eslint-disable @typescript-eslint/no-explicit-any */
const fs = __importStar(__webpack_require__(5747));
const os = __importStar(__webpack_require__(2087));
const utils_1 = __webpack_require__(5278);
function issueCommand(command, message) {
const filePath = process.env[`GITHUB_${command}`];
if (!filePath) {
throw new Error(`Unable to find environment variable for file command ${command}`);
}
if (!fs.existsSync(filePath)) {
throw new Error(`Missing file at path: ${filePath}`);
}
fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
encoding: 'utf8'
});
}
exports.issueCommand = issueCommand;
//# sourceMappingURL=file-command.js.map
/***/ }),
/***/ 5278:
/***/ ((__unused_webpack_module, exports) => {
"use strict";
// We use any as a valid input type
/* eslint-disable @typescript-eslint/no-explicit-any */
Object.defineProperty(exports, "__esModule", ({ value: true }));
/**
* Sanitizes an input into a string so it can be passed into issueCommand safely
* @param input input to sanitize into a string
*/
function toCommandValue(input) {
if (input === null || input === undefined) {
return '';
}
else if (typeof input === 'string' || input instanceof String) {
return input;
}
return JSON.stringify(input);
}
exports.toCommandValue = toCommandValue;
//# sourceMappingURL=utils.js.map
/***/ }),
/***/ 1514: /***/ 1514:
/***/ (function(__unused_webpack_module, exports, __webpack_require__) { /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
@@ -1078,7 +1116,6 @@ class ExecState extends events.EventEmitter {
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
const url = __webpack_require__(8835);
const http = __webpack_require__(8605); const http = __webpack_require__(8605);
const https = __webpack_require__(7211); const https = __webpack_require__(7211);
const pm = __webpack_require__(6443); const pm = __webpack_require__(6443);
@@ -1127,7 +1164,7 @@ var MediaTypes;
* @param serverUrl The server URL where the request will be sent. For example, https://api.github.com * @param serverUrl The server URL where the request will be sent. For example, https://api.github.com
*/ */
function getProxyUrl(serverUrl) { function getProxyUrl(serverUrl) {
let proxyUrl = pm.getProxyUrl(url.parse(serverUrl)); let proxyUrl = pm.getProxyUrl(new URL(serverUrl));
return proxyUrl ? proxyUrl.href : ''; return proxyUrl ? proxyUrl.href : '';
} }
exports.getProxyUrl = getProxyUrl; exports.getProxyUrl = getProxyUrl;
@@ -1146,6 +1183,15 @@ const HttpResponseRetryCodes = [
const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD']; const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
const ExponentialBackoffCeiling = 10; const ExponentialBackoffCeiling = 10;
const ExponentialBackoffTimeSlice = 5; const ExponentialBackoffTimeSlice = 5;
class HttpClientError extends Error {
constructor(message, statusCode) {
super(message);
this.name = 'HttpClientError';
this.statusCode = statusCode;
Object.setPrototypeOf(this, HttpClientError.prototype);
}
}
exports.HttpClientError = HttpClientError;
class HttpClientResponse { class HttpClientResponse {
constructor(message) { constructor(message) {
this.message = message; this.message = message;
@@ -1164,7 +1210,7 @@ class HttpClientResponse {
} }
exports.HttpClientResponse = HttpClientResponse; exports.HttpClientResponse = HttpClientResponse;
function isHttps(requestUrl) { function isHttps(requestUrl) {
let parsedUrl = url.parse(requestUrl); let parsedUrl = new URL(requestUrl);
return parsedUrl.protocol === 'https:'; return parsedUrl.protocol === 'https:';
} }
exports.isHttps = isHttps; exports.isHttps = isHttps;
@@ -1269,7 +1315,7 @@ class HttpClient {
if (this._disposed) { if (this._disposed) {
throw new Error('Client has already been disposed.'); throw new Error('Client has already been disposed.');
} }
let parsedUrl = url.parse(requestUrl); let parsedUrl = new URL(requestUrl);
let info = this._prepareRequest(verb, parsedUrl, headers); let info = this._prepareRequest(verb, parsedUrl, headers);
// Only perform retries on reads since writes may not be idempotent. // Only perform retries on reads since writes may not be idempotent.
let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1 let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
@@ -1308,7 +1354,7 @@ class HttpClient {
// if there's no location to redirect to, we won't // if there's no location to redirect to, we won't
break; break;
} }
let parsedRedirectUrl = url.parse(redirectUrl); let parsedRedirectUrl = new URL(redirectUrl);
if (parsedUrl.protocol == 'https:' && if (parsedUrl.protocol == 'https:' &&
parsedUrl.protocol != parsedRedirectUrl.protocol && parsedUrl.protocol != parsedRedirectUrl.protocol &&
!this._allowRedirectDowngrade) { !this._allowRedirectDowngrade) {
@@ -1424,7 +1470,7 @@ class HttpClient {
* @param serverUrl The server URL where the request will be sent. For example, https://api.github.com * @param serverUrl The server URL where the request will be sent. For example, https://api.github.com
*/ */
getAgent(serverUrl) { getAgent(serverUrl) {
let parsedUrl = url.parse(serverUrl); let parsedUrl = new URL(serverUrl);
return this._getAgent(parsedUrl); return this._getAgent(parsedUrl);
} }
_prepareRequest(method, requestUrl, headers) { _prepareRequest(method, requestUrl, headers) {
@@ -1497,7 +1543,7 @@ class HttpClient {
maxSockets: maxSockets, maxSockets: maxSockets,
keepAlive: this._keepAlive, keepAlive: this._keepAlive,
proxy: { proxy: {
proxyAuth: proxyUrl.auth, proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`,
host: proxyUrl.hostname, host: proxyUrl.hostname,
port: proxyUrl.port port: proxyUrl.port
} }
@@ -1592,12 +1638,8 @@ class HttpClient {
else { else {
msg = 'Failed request: (' + statusCode + ')'; msg = 'Failed request: (' + statusCode + ')';
} }
let err = new Error(msg); let err = new HttpClientError(msg, statusCode);
// attach statusCode and body obj (if available) to the error object err.result = response.result;
err['statusCode'] = statusCode;
if (response.result) {
err['result'] = response.result;
}
reject(err); reject(err);
} }
else { else {
@@ -1612,12 +1654,11 @@ exports.HttpClient = HttpClient;
/***/ }), /***/ }),
/***/ 6443: /***/ 6443:
/***/ ((__unused_webpack_module, exports, __webpack_require__) => { /***/ ((__unused_webpack_module, exports) => {
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
const url = __webpack_require__(8835);
function getProxyUrl(reqUrl) { function getProxyUrl(reqUrl) {
let usingSsl = reqUrl.protocol === 'https:'; let usingSsl = reqUrl.protocol === 'https:';
let proxyUrl; let proxyUrl;
@@ -1632,7 +1673,7 @@ function getProxyUrl(reqUrl) {
proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY']; proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
} }
if (proxyVar) { if (proxyVar) {
proxyUrl = url.parse(proxyVar); proxyUrl = new URL(proxyVar);
} }
return proxyUrl; return proxyUrl;
} }
@@ -2409,7 +2450,7 @@ class HTTPError extends Error {
constructor(httpStatusCode) { constructor(httpStatusCode) {
super(`Unexpected HTTP response: ${httpStatusCode}`); super(`Unexpected HTTP response: ${httpStatusCode}`);
this.httpStatusCode = httpStatusCode; this.httpStatusCode = httpStatusCode;
Object.setPrototypeOf(this, /* unsupported import.meta.prototype */ undefined); Object.setPrototypeOf(this, new.target.prototype);
} }
} }
exports.HTTPError = HTTPError; exports.HTTPError = HTTPError;
@@ -7457,13 +7498,89 @@ function wrappy (fn, cb) {
} }
/***/ }),
/***/ 3470:
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
const path = __webpack_require__(5622)
const get = __webpack_require__(2522).concat
const semver = __webpack_require__(1383)
function extForPlatform (platform) {
return {
linux: 'tar.xz',
darwin: 'tar.xz',
win32: 'zip'
}[platform]
}
function resolveCommit (platform, version) {
const ext = extForPlatform(platform)
const addrhost = {
linux: 'linux-x86_64',
darwin: 'macos-x86_64',
win32: 'windows-x86_64'
}[platform]
const downloadUrl = `https://ziglang.org/builds/zig-${addrhost}-${version}.${ext}`
const variantName = `zig-${addrhost}-${version}`
return { downloadUrl, variantName }
}
function getJSON (opts) {
return new Promise((resolve, reject) => {
get({ ...opts, json: true }, (err, req, data) => {
if (err) {
reject(err)
} else {
resolve(data)
}
})
})
}
async function resolveVersion (platform, version) {
const ext = extForPlatform(platform)
const host = {
linux: 'x86_64-linux',
darwin: 'x86_64-macos',
win32: 'x86_64-windows'
}[platform] || platform
const index = await getJSON({ url: 'https://ziglang.org/download/index.json' })
const availableVersions = Object.keys(index)
const useVersion = semver.valid(version)
? semver.maxSatisfying(availableVersions.filter((v) => semver.valid(v)), version)
: null
const meta = index[useVersion || version]
if (!meta || !meta[host]) {
throw new Error(`Could not find version ${useVersion || version} for platform ${host}`)
}
const downloadUrl = meta[host].tarball
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
return { downloadUrl, variantName }
}
module.exports = {
extForPlatform,
resolveCommit,
resolveVersion
}
/***/ }), /***/ }),
/***/ 2357: /***/ 2357:
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("assert"); module.exports = require("assert");;
/***/ }), /***/ }),
@@ -7471,7 +7588,7 @@ module.exports = require("assert");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("child_process"); module.exports = require("child_process");;
/***/ }), /***/ }),
@@ -7479,7 +7596,7 @@ module.exports = require("child_process");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("crypto"); module.exports = require("crypto");;
/***/ }), /***/ }),
@@ -7487,7 +7604,7 @@ module.exports = require("crypto");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("events"); module.exports = require("events");;
/***/ }), /***/ }),
@@ -7495,7 +7612,7 @@ module.exports = require("events");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("fs"); module.exports = require("fs");;
/***/ }), /***/ }),
@@ -7503,7 +7620,7 @@ module.exports = require("fs");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("http"); module.exports = require("http");;
/***/ }), /***/ }),
@@ -7511,7 +7628,7 @@ module.exports = require("http");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("https"); module.exports = require("https");;
/***/ }), /***/ }),
@@ -7519,7 +7636,7 @@ module.exports = require("https");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("net"); module.exports = require("net");;
/***/ }), /***/ }),
@@ -7527,7 +7644,7 @@ module.exports = require("net");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("os"); module.exports = require("os");;
/***/ }), /***/ }),
@@ -7535,7 +7652,7 @@ module.exports = require("os");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("path"); module.exports = require("path");;
/***/ }), /***/ }),
@@ -7543,7 +7660,7 @@ module.exports = require("path");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("querystring"); module.exports = require("querystring");;
/***/ }), /***/ }),
@@ -7551,7 +7668,7 @@ module.exports = require("querystring");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("stream"); module.exports = require("stream");;
/***/ }), /***/ }),
@@ -7559,7 +7676,7 @@ module.exports = require("stream");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("tls"); module.exports = require("tls");;
/***/ }), /***/ }),
@@ -7567,7 +7684,7 @@ module.exports = require("tls");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("url"); module.exports = require("url");;
/***/ }), /***/ }),
@@ -7575,7 +7692,7 @@ module.exports = require("url");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("util"); module.exports = require("util");;
/***/ }), /***/ }),
@@ -7583,7 +7700,7 @@ module.exports = require("util");
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = require("zlib"); module.exports = require("zlib");;
/***/ }) /***/ })
+12 -39
View File
@@ -1,49 +1,22 @@
const os = require('os') const os = require('os')
const path = require('path') const path = require('path')
const semver = require('semver') const semver = require('semver')
const get = require('simple-get').concat
const actions = require('@actions/core') const actions = require('@actions/core')
const cache = require('@actions/tool-cache') const cache = require('@actions/tool-cache')
const {
extForPlatform,
resolveCommit,
resolveVersion
} = require('./versions')
function getJSON (opts) { async function downloadZig (platform, version) {
return new Promise((resolve, reject) => { const ext = extForPlatform(platform)
get({ ...opts, json: true }, (err, req, data) => {
if (err) {
reject(err)
} else {
resolve(data)
}
})
})
}
async function downloadZig (version) { const { downloadUrl, variantName } = version.includes('+')
const host = { ? resolveCommit(platform, version)
linux: 'x86_64-linux', : await resolveVersion(platform, version)
darwin: 'x86_64-macos',
win32: 'x86_64-windows'
}[os.platform()] || os.platform()
const ext = {
linux: 'tar.xz',
darwin: 'tar.xz',
win32: 'zip'
}[os.platform()]
const index = await getJSON({ url: 'https://ziglang.org/download/index.json' }) const downloadPath = await cache.downloadTool(downloadUrl)
const availableVersions = Object.keys(index)
const useVersion = semver.valid(version)
? semver.maxSatisfying(availableVersions.filter((v) => semver.valid(v)), version)
: null
const meta = index[useVersion || version]
if (!meta || !meta[host]) {
throw new Error(`Could not find version ${version} for platform ${host}`)
}
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
const downloadPath = await cache.downloadTool(meta[host].tarball)
const zigPath = ext === 'zip' const zigPath = ext === 'zip'
? await cache.extractZip(downloadPath) ? await cache.extractZip(downloadPath)
: await cache.extractTar(downloadPath, undefined, 'x') : await cache.extractTar(downloadPath, undefined, 'x')
@@ -63,7 +36,7 @@ async function main () {
let zigPath = cache.find('zig', version) let zigPath = cache.find('zig', version)
if (!zigPath) { if (!zigPath) {
zigPath = await downloadZig(version) zigPath = await downloadZig(os.platform(), version)
} }
// Add the `zig` binary to the $PATH // Add the `zig` binary to the $PATH
+4 -4
View File
@@ -1,7 +1,7 @@
{ {
"name": "setup-zig", "name": "setup-zig",
"description": "Use the zig compiler in your Github Action", "description": "Use the zig compiler in your Github Action",
"version": "1.2.4", "version": "1.3.0",
"author": "Renée Kooi <renee@kooi.me>", "author": "Renée Kooi <renee@kooi.me>",
"bugs": { "bugs": {
"url": "https://github.com/goto-bus-stop/setup-zig/issues" "url": "https://github.com/goto-bus-stop/setup-zig/issues"
@@ -13,8 +13,8 @@
"simple-get": "^4.0.0" "simple-get": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@vercel/ncc": "^0.24.1", "@vercel/ncc": "^0.25.0",
"standard": "^14.3.1" "standard": "^16.0.1"
}, },
"homepage": "https://github.com/goto-bus-stop/setup-zig", "homepage": "https://github.com/goto-bus-stop/setup-zig",
"keywords": [ "keywords": [
@@ -31,7 +31,7 @@
}, },
"scripts": { "scripts": {
"prepare": "ncc build index.js -o dist", "prepare": "ncc build index.js -o dist",
"test": "standard" "test": "standard && node test"
}, },
"standard": { "standard": {
"ignore": [ "ignore": [
+32
View File
@@ -0,0 +1,32 @@
const assert = require('assert').strict
const {
resolveCommit,
resolveVersion
} = require('./versions')
async function test () {
assert.deepEqual(resolveCommit('linux', '0.6.0+4b48fccad'), {
downloadUrl: 'https://ziglang.org/builds/zig-linux-x86_64-0.6.0+4b48fccad.tar.xz',
variantName: 'zig-linux-x86_64-0.6.0+4b48fccad'
})
assert.deepEqual(resolveCommit('win32', '0.6.0+4b48fccad'), {
downloadUrl: 'https://ziglang.org/builds/zig-windows-x86_64-0.6.0+4b48fccad.zip',
variantName: 'zig-windows-x86_64-0.6.0+4b48fccad'
})
assert.deepEqual(await resolveVersion('linux', '0.7.0'), {
downloadUrl: 'https://ziglang.org/download/0.7.0/zig-linux-x86_64-0.7.0.tar.xz',
variantName: 'zig-linux-x86_64-0.7.0'
})
assert.deepEqual(await resolveVersion('win32', '0.4.0'), {
downloadUrl: 'https://ziglang.org/download/0.4.0/zig-windows-x86_64-0.4.0.zip',
variantName: 'zig-windows-x86_64-0.4.0'
})
await assert.doesNotReject(resolveVersion('linux', 'master'))
await assert.doesNotReject(resolveVersion('win32', 'master'))
}
test().catch((error) => {
console.error(error.stack)
process.exit(1)
})
+69
View File
@@ -0,0 +1,69 @@
const path = require('path')
const get = require('simple-get').concat
const semver = require('semver')
function extForPlatform (platform) {
return {
linux: 'tar.xz',
darwin: 'tar.xz',
win32: 'zip'
}[platform]
}
function resolveCommit (platform, version) {
const ext = extForPlatform(platform)
const addrhost = {
linux: 'linux-x86_64',
darwin: 'macos-x86_64',
win32: 'windows-x86_64'
}[platform]
const downloadUrl = `https://ziglang.org/builds/zig-${addrhost}-${version}.${ext}`
const variantName = `zig-${addrhost}-${version}`
return { downloadUrl, variantName }
}
function getJSON (opts) {
return new Promise((resolve, reject) => {
get({ ...opts, json: true }, (err, req, data) => {
if (err) {
reject(err)
} else {
resolve(data)
}
})
})
}
async function resolveVersion (platform, version) {
const ext = extForPlatform(platform)
const host = {
linux: 'x86_64-linux',
darwin: 'x86_64-macos',
win32: 'x86_64-windows'
}[platform] || platform
const index = await getJSON({ url: 'https://ziglang.org/download/index.json' })
const availableVersions = Object.keys(index)
const useVersion = semver.valid(version)
? semver.maxSatisfying(availableVersions.filter((v) => semver.valid(v)), version)
: null
const meta = index[useVersion || version]
if (!meta || !meta[host]) {
throw new Error(`Could not find version ${useVersion || version} for platform ${host}`)
}
const downloadUrl = meta[host].tarball
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
return { downloadUrl, variantName }
}
module.exports = {
extForPlatform,
resolveCommit,
resolveVersion
}