mirror of
https://github.com/BloopAI/setup-zig.git
synced 2026-11-16 22:00:24 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e24fd328aa | ||
|
|
d77db2eb23 | ||
|
|
ddee6faec6 | ||
|
|
dfa210dd0b | ||
|
|
a64a1dc5e1 | ||
|
|
64c2ecb313 | ||
|
|
869a4299cf | ||
|
|
75b5fc3918 | ||
|
|
7784e301e8 |
@@ -9,7 +9,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- uses: EndBug/add-and-commit@v4
|
- uses: EndBug/add-and-commit@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout sources
|
- name: Checkout sources
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm install
|
run: npm install
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
zig-version: [0.7.0, 0.8.0, 0.9.0, master]
|
zig-version: [0.7.0, 0.8.0, 0.9.0, 0.10.0]
|
||||||
include:
|
include:
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
zig-version: 0.5.0
|
zig-version: 0.5.0
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ 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/).
|
||||||
|
|
||||||
|
## 2.0.2
|
||||||
|
* Fix tool-cache usage, this should speed up the action if zig was already downloaded before. [#45](https://github.com/goto-bus-stop/setup-zig/pull/45)
|
||||||
|
|
||||||
|
## 2.0.1
|
||||||
|
* Update docs to v2
|
||||||
|
|
||||||
## 2.0.0
|
## 2.0.0
|
||||||
* Change `version` option default to `master`. See [#24](https://github.com/goto-bus-stop/setup-zig/issues/24)
|
* Change `version` option default to `master`. See [#24](https://github.com/goto-bus-stop/setup-zig/issues/24)
|
||||||
|
|
||||||
|
|||||||
@@ -17,19 +17,19 @@ jobs:
|
|||||||
runs-on: ${{matrix.os}}
|
runs-on: ${{matrix.os}}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: goto-bus-stop/setup-zig@v1
|
- uses: goto-bus-stop/setup-zig@v2
|
||||||
- run: zig build test
|
- run: zig build test
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: goto-bus-stop/setup-zig@v1
|
- uses: goto-bus-stop/setup-zig@v2
|
||||||
- run: zig fmt --check src/*.zig
|
- run: zig fmt --check src/*.zig
|
||||||
```
|
```
|
||||||
|
|
||||||
Optionally set a Zig version:
|
Optionally set a Zig version:
|
||||||
```yaml
|
```yaml
|
||||||
- uses: goto-bus-stop/setup-zig@v1
|
- uses: goto-bus-stop/setup-zig@v2
|
||||||
with:
|
with:
|
||||||
version: 0.7.0
|
version: 0.7.0
|
||||||
```
|
```
|
||||||
@@ -38,7 +38,7 @@ The default is to use the nightly `master` builds.
|
|||||||
|
|
||||||
Or [pin to a specific commit](https://github.com/goto-bus-stop/setup-zig/issues/13) using `version+commithash` syntax:
|
Or [pin to a specific commit](https://github.com/goto-bus-stop/setup-zig/issues/13) using `version+commithash` syntax:
|
||||||
```yaml
|
```yaml
|
||||||
- uses: goto-bus-stop/setup-zig@v1
|
- uses: goto-bus-stop/setup-zig@v2
|
||||||
with:
|
with:
|
||||||
version: 0.6.0+4b48fccad
|
version: 0.6.0+4b48fccad
|
||||||
```
|
```
|
||||||
|
|||||||
Vendored
+727
-636
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,5 @@
|
|||||||
|
'use strict'
|
||||||
|
|
||||||
const os = require('os')
|
const os = require('os')
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const semver = require('semver')
|
const semver = require('semver')
|
||||||
@@ -9,20 +11,30 @@ const {
|
|||||||
resolveVersion
|
resolveVersion
|
||||||
} = require('./versions')
|
} = require('./versions')
|
||||||
|
|
||||||
|
const TOOL_NAME = 'zig'
|
||||||
|
|
||||||
async function downloadZig (platform, version) {
|
async function downloadZig (platform, version) {
|
||||||
const ext = extForPlatform(platform)
|
const ext = extForPlatform(platform)
|
||||||
|
|
||||||
const { downloadUrl, variantName } = version.includes('+')
|
const { downloadUrl, variantName, version: useVersion } = version.includes('+')
|
||||||
? resolveCommit(platform, version)
|
? resolveCommit(platform, version)
|
||||||
: await resolveVersion(platform, version)
|
: await resolveVersion(platform, version)
|
||||||
|
|
||||||
|
const cachedPath = cache.find(TOOL_NAME, useVersion)
|
||||||
|
if (cachedPath) {
|
||||||
|
actions.info(`using cached zig install: ${cachedPath}`)
|
||||||
|
return cachedPath
|
||||||
|
}
|
||||||
|
|
||||||
|
actions.info(`no cached version found. downloading zig ${variantName}`)
|
||||||
const downloadPath = await cache.downloadTool(downloadUrl)
|
const downloadPath = await cache.downloadTool(downloadUrl)
|
||||||
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')
|
||||||
|
|
||||||
const binPath = path.join(zigPath, variantName)
|
const binPath = path.join(zigPath, variantName)
|
||||||
const cachePath = await cache.cacheDir(binPath, 'zig', variantName)
|
const cachePath = await cache.cacheDir(binPath, TOOL_NAME, useVersion)
|
||||||
|
actions.info(`added zig ${useVersion} to the tool cache`)
|
||||||
|
|
||||||
return cachePath
|
return cachePath
|
||||||
}
|
}
|
||||||
@@ -34,13 +46,11 @@ async function main () {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let zigPath = cache.find('zig', version)
|
const zigPath = await downloadZig(os.platform(), version)
|
||||||
if (!zigPath) {
|
|
||||||
zigPath = await downloadZig(os.platform(), version)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add the `zig` binary to the $PATH
|
// Add the `zig` binary to the $PATH
|
||||||
actions.addPath(zigPath)
|
actions.addPath(zigPath)
|
||||||
|
actions.info(`zig installed at ${zigPath}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
main().catch((err) => {
|
main().catch((err) => {
|
||||||
|
|||||||
+2
-2
@@ -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": "2.0.0",
|
"version": "2.0.2",
|
||||||
"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,7 +13,7 @@
|
|||||||
"simple-get": "^4.0.0"
|
"simple-get": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"esbuild": "^0.15.13",
|
"esbuild": "^0.17.19",
|
||||||
"standard": "^17.0.0"
|
"standard": "^17.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/goto-bus-stop/setup-zig",
|
"homepage": "https://github.com/goto-bus-stop/setup-zig",
|
||||||
|
|||||||
@@ -7,20 +7,24 @@ const {
|
|||||||
async function test () {
|
async function test () {
|
||||||
assert.deepEqual(resolveCommit('linux', '0.6.0+4b48fccad'), {
|
assert.deepEqual(resolveCommit('linux', '0.6.0+4b48fccad'), {
|
||||||
downloadUrl: 'https://ziglang.org/builds/zig-linux-x86_64-0.6.0+4b48fccad.tar.xz',
|
downloadUrl: 'https://ziglang.org/builds/zig-linux-x86_64-0.6.0+4b48fccad.tar.xz',
|
||||||
variantName: 'zig-linux-x86_64-0.6.0+4b48fccad'
|
variantName: 'zig-linux-x86_64-0.6.0+4b48fccad',
|
||||||
|
version: '0.6.0+4b48fccad'
|
||||||
})
|
})
|
||||||
assert.deepEqual(resolveCommit('win32', '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',
|
downloadUrl: 'https://ziglang.org/builds/zig-windows-x86_64-0.6.0+4b48fccad.zip',
|
||||||
variantName: 'zig-windows-x86_64-0.6.0+4b48fccad'
|
variantName: 'zig-windows-x86_64-0.6.0+4b48fccad',
|
||||||
|
version: '0.6.0+4b48fccad'
|
||||||
})
|
})
|
||||||
|
|
||||||
assert.deepEqual(await resolveVersion('linux', '0.7.0'), {
|
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',
|
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'
|
variantName: 'zig-linux-x86_64-0.7.0',
|
||||||
|
version: '0.7.0'
|
||||||
})
|
})
|
||||||
assert.deepEqual(await resolveVersion('win32', '0.4.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',
|
downloadUrl: 'https://ziglang.org/download/0.4.0/zig-windows-x86_64-0.4.0.zip',
|
||||||
variantName: 'zig-windows-x86_64-0.4.0'
|
variantName: 'zig-windows-x86_64-0.4.0',
|
||||||
|
version: '0.4.0'
|
||||||
})
|
})
|
||||||
await assert.doesNotReject(resolveVersion('linux', 'master'))
|
await assert.doesNotReject(resolveVersion('linux', 'master'))
|
||||||
await assert.doesNotReject(resolveVersion('win32', 'master'))
|
await assert.doesNotReject(resolveVersion('win32', 'master'))
|
||||||
|
|||||||
+2
-2
@@ -21,7 +21,7 @@ function resolveCommit (platform, version) {
|
|||||||
const downloadUrl = `https://ziglang.org/builds/zig-${addrhost}-${version}.${ext}`
|
const downloadUrl = `https://ziglang.org/builds/zig-${addrhost}-${version}.${ext}`
|
||||||
const variantName = `zig-${addrhost}-${version}`
|
const variantName = `zig-${addrhost}-${version}`
|
||||||
|
|
||||||
return { downloadUrl, variantName }
|
return { downloadUrl, variantName, version }
|
||||||
}
|
}
|
||||||
|
|
||||||
function getJSON (opts) {
|
function getJSON (opts) {
|
||||||
@@ -59,7 +59,7 @@ async function resolveVersion (platform, version) {
|
|||||||
const downloadUrl = meta[host].tarball
|
const downloadUrl = meta[host].tarball
|
||||||
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
|
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
|
||||||
|
|
||||||
return { downloadUrl, variantName }
|
return { downloadUrl, variantName, version: useVersion || version }
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|||||||
Reference in New Issue
Block a user