Actually support downloading Zig version: master
(#5)
* Fix extracted folder name
* ci: also test with zig master
* fix lint
* fail on error
* debug
* other debug 😂
* console.log
* lol apply the change
* yadda
* wtf
* fuck
* ????
* xauuaoethosnuhtnohqsn
* siiiiiigh
* just use stderr lol whatever
* ditch debugging
* use test
This commit is contained in:
parent
25e170b42c
commit
bd0d3f0ae3
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
|
@ -15,11 +15,12 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
|
zig-version: [0.5.0, master]
|
||||||
runs-on: ${{matrix.os}}
|
runs-on: ${{matrix.os}}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- uses: goto-bus-stop/setup-zig@default
|
- uses: goto-bus-stop/setup-zig@fix-4
|
||||||
with:
|
with:
|
||||||
version: 0.5.0
|
version: ${{matrix.zig-version}}
|
||||||
- run: zig run src/main.zig
|
- run: zig build test
|
||||||
working-directory: test
|
working-directory: test
|
||||||
|
|
18
dist/index.js
vendored
18
dist/index.js
vendored
|
@ -1135,19 +1135,17 @@ async function downloadZig (version) {
|
||||||
throw new Error(`Could not find version ${version} for platform ${host}`)
|
throw new Error(`Could not find version ${version} for platform ${host}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const hostVariantName = {
|
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
|
||||||
linux: 'linux-x86_64',
|
|
||||||
darwin: 'macos-x86_64',
|
|
||||||
win32: 'windows-x86_64'
|
|
||||||
}[os.platform()]
|
|
||||||
const variantName = `zig-${hostVariantName}-${version}`
|
|
||||||
const downloadPath = await cache.downloadTool(meta[host].tarball)
|
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')
|
||||||
|
|
||||||
const binPath = path.join(zigPath, variantName)
|
const binPath = path.join(zigPath, variantName)
|
||||||
return cache.cacheDir(binPath, 'zig', version)
|
const cachePath = await cache.cacheDir(binPath, 'zig', variantName)
|
||||||
|
|
||||||
|
return cachePath
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main () {
|
async function main () {
|
||||||
|
@ -1166,7 +1164,11 @@ async function main () {
|
||||||
actions.addPath(zigPath)
|
actions.addPath(zigPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
main()
|
main().catch((err) => {
|
||||||
|
console.error(err.stack)
|
||||||
|
actions.setFailed(err.message)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
18
index.js
18
index.js
|
@ -41,19 +41,17 @@ async function downloadZig (version) {
|
||||||
throw new Error(`Could not find version ${version} for platform ${host}`)
|
throw new Error(`Could not find version ${version} for platform ${host}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const hostVariantName = {
|
const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
|
||||||
linux: 'linux-x86_64',
|
|
||||||
darwin: 'macos-x86_64',
|
|
||||||
win32: 'windows-x86_64'
|
|
||||||
}[os.platform()]
|
|
||||||
const variantName = `zig-${hostVariantName}-${version}`
|
|
||||||
const downloadPath = await cache.downloadTool(meta[host].tarball)
|
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')
|
||||||
|
|
||||||
const binPath = path.join(zigPath, variantName)
|
const binPath = path.join(zigPath, variantName)
|
||||||
return cache.cacheDir(binPath, 'zig', version)
|
const cachePath = await cache.cacheDir(binPath, 'zig', variantName)
|
||||||
|
|
||||||
|
return cachePath
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main () {
|
async function main () {
|
||||||
|
@ -72,4 +70,8 @@ async function main () {
|
||||||
actions.addPath(zigPath)
|
actions.addPath(zigPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
main()
|
main().catch((err) => {
|
||||||
|
console.error(err.stack)
|
||||||
|
actions.setFailed(err.message)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
|
|
|
@ -2,13 +2,9 @@ const Builder = @import("std").build.Builder;
|
||||||
|
|
||||||
pub fn build(b: *Builder) void {
|
pub fn build(b: *Builder) void {
|
||||||
const mode = b.standardReleaseOptions();
|
const mode = b.standardReleaseOptions();
|
||||||
const exe = b.addExecutable("test", "src/main.zig");
|
const test_build = b.addTest("src/main.zig");
|
||||||
exe.setBuildMode(mode);
|
test_build.setBuildMode(mode);
|
||||||
exe.install();
|
|
||||||
|
|
||||||
const run_cmd = exe.run();
|
const test_step = b.step("test", "Run the app");
|
||||||
run_cmd.step.dependOn(b.getInstallStep());
|
test_step.dependOn(&test_build.step);
|
||||||
|
|
||||||
const run_step = b.step("run", "Run the app");
|
|
||||||
run_step.dependOn(&run_cmd.step);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
const io = @import("std").io;
|
const debug = @import("std").debug;
|
||||||
|
|
||||||
pub fn main() anyerror!void {
|
test "it works" {
|
||||||
const stdout = try io.getStdOut();
|
debug.assert(1 == 1);
|
||||||
try stdout.write("it works!\n");
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user