Build dist

* ci: tweak versions matrix

* tweak ifs

* ci: different way to use legacy versions

* clearer test variant name

* fixup! clearer test variant name

* syntax?

.editorconfig

@@ -0,0 +1,23 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+
+[*.md]
+trim_trailing_whitespace = false

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -9,13 +9,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: npm install
-      - uses: EndBug/add-and-commit@v4
+      - uses: EndBug/add-and-commit@v9
         with:
           add: dist
-          message: Rebuild
+          message: Rebuild (automated)
-          author_name: Automated
-          author_email: github@asdf.kooi.me
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install dependencies
         run: npm install
       - name: Run tests
@@ -15,17 +15,38 @@ jobs:
   smoke-test:
     name: Build test
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-12, macos-latest, windows-latest]
-        zig-version: [0.5.0, 0.7.0, master]
+        zig-version: [0.11.0, 0.12.0]
+        test-variant: [modern]
+        include:
+          - { os: ubuntu-latest, zig-version: 0.5.0, test-variant: legacy }
+          - { os: ubuntu-latest, zig-version: 0.7.0, test-variant: legacy }
+          - { os: ubuntu-latest, zig-version: 0.8.0, test-variant: legacy }
+          - { os: ubuntu-latest, zig-version: 0.9.0, test-variant: legacy }
+          - { os: ubuntu-latest, zig-version: 0.10.0, test-variant: legacy }
+          - { os: macos-12, zig-version: 0.7.0, test-variant: legacy }
+          - { os: macos-12, zig-version: 0.8.0, test-variant: legacy }
+          - { os: macos-12, zig-version: 0.9.0, test-variant: legacy }
+          - { os: macos-12, zig-version: 0.10.0, test-variant: legacy }
+          - { os: windows-latest, zig-version: 0.7.0, test-variant: legacy }
+          - { os: windows-latest, zig-version: 0.8.0, test-variant: legacy }
+          - { os: windows-latest, zig-version: 0.9.0, test-variant: legacy }
+          - { os: windows-latest, zig-version: 0.10.0, test-variant: legacy }
     runs-on: ${{matrix.os}}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Zig
         uses: goto-bus-stop/setup-zig@default
         with:
           version: ${{matrix.zig-version}}
-      - name: Run tests
+      - name: Run tests (zig up to v0.10.x)
+        if: ${{ matrix.test-variant == 'legacy' }}
         run: zig build test
-        working-directory: test
+        working-directory: test/v0.10
+      - name: Run tests (zig v0.11.x)
+        if: ${{ matrix.test-variant == 'modern' }}
+        run: zig build test
+        working-directory: test/v0.11

.gitignore

@@ -1,3 +1,5 @@
+node_modules
+
 # Logs
 logs
 *.log

CHANGELOG.md

@@ -4,6 +4,44 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.2.1
+
+This will be the final release in this repository.
+Please see [#88](https://github.com/goto-bus-stop/setup-zig/issues/88) for an upgrade guide.
+Thanks for using setup-zig!
+
+* Fix Apple Silicon. [#68](https://github.com/goto-bus-stop/setup-zig/pull/68)
+* Deprecate in favour of [mlugg/setup-zig](https://github.com/mlugg/setup-zig). [#89](https://github.com/goto-bus-stop/setup-zig/pull/89)
+
+Thanks [@davidgm94](https://github.com/davidgm94) and [@mlugg](https://github.com/mlugg)!
+
+## 2.2.0
+* Update the action to use Node.js 20. [#61](https://github.com/goto-bus-stop/setup-zig/pull/61)
+* Add a test for zig 0.11.0. [#62](https://github.com/goto-bus-stop/setup-zig/pull/62)
+
+Thanks [@chenrui333](https://github.com/chenrui333)!
+
+## 2.1.1
+* Fix `cache: false`, see [#55](https://github.com/goto-bus-stop/setup-zig/issues/55).
+
+Thanks to [@linusg](https://github.com/linusg) for the report!
+
+## 2.1.0
+* The action now caches compilers in your repository's Actions cache by default. This significantly
+  speeds up installs on average. [#53](https://github.com/goto-bus-stop/setup-zig/pull/53)
+
+  2.0.2 also had caching-related changes but they didn't actually do much, based on a misunderstanding
+  of what the `tool-cache` is for.
+
+## 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
+* Change `version` option default to `master`. See [#24](https://github.com/goto-bus-stop/setup-zig/issues/24)
+
 ## 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

README.md

@@ -2,6 +2,9 @@
 
 Use the zig compiler in your Github Actions workflows
 
+> [!WARNING]
+> This GitHub Action is unmaintained. Please use [mlugg/setup-zig](https://github.com/mlugg/setup-zig) instead.
+
 [Usage](#usage) - [License: Apache-2.0](#license)
 
 ## Usage
@@ -17,33 +20,28 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v2
-      - uses: goto-bus-stop/setup-zig@v1
+      - uses: goto-bus-stop/setup-zig@v2
       - run: zig build test
   lint:
     runs-on: ubuntu-latest
     steps:
       - 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 .
 ```
 
 Optionally set a Zig version:
 ```yaml
-- uses: goto-bus-stop/setup-zig@v1
+- uses: goto-bus-stop/setup-zig@v2
   with:
-    version: 0.7.0 # The default is 0.5.0
+    version: 0.7.0
 ```
 
-To use the nightly builds, set:
+The default is to use the nightly `master` builds.
-```yaml
-- uses: goto-bus-stop/setup-zig@v1
-  with:
-    version: master
-```
 
 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
+- uses: goto-bus-stop/setup-zig@v2
   with:
     version: 0.6.0+4b48fccad
 ```
@@ -53,6 +51,18 @@ If you are running Zig on Windows machines, you need to make sure that your .zig
 *.zig text eol=lf
 ```
 
+This action caches the downloaded compilers in your repository's Actions cache by default,
+to reduce the load on the Zig Foundation's servers. Cached compilers are only about 60MB
+each per version/OS/architecture.
+
+If this is really bad for you for some reason you can disable the caching.
+
+```yaml
+- uses: goto-bus-stop/setup-zig@v2
+  with:
+    cache: false
+```
+
 ## License
 
 [Apache-2.0](LICENSE.md)

action.yml

@@ -1,5 +1,5 @@
-name: 'Setup Zig'
+name: 'Setup Zig (legacy)'
-description: 'Setup a Zig compiler and add it to the path'
+description: 'Please use mlugg/setup-zig instead'
 branding:
   icon: play
   color: orange
@@ -8,7 +8,11 @@ inputs:
   version:
     description: 'Version of the zig compiler to use (must be 0.3.0 or up)'
     required: true
-    default: '0.5.0'
+    default: 'master'
+  cache:
+    description: 'Cache downloaded compilers for faster action runs. Strongly recommended.'
+    required: false
+    default: 'true'
 runs:
-  using: 'node12'
+  using: 'node20'
   main: 'dist/index.js'

index.js

@@ -1,46 +1,77 @@
+'use strict'
+
 const os = require('os')
 const path = require('path')
 const semver = require('semver')
 const actions = require('@actions/core')
-const cache = require('@actions/tool-cache')
+const cache = require('@actions/cache')
+const toolCache = require('@actions/tool-cache')
 const {
   extForPlatform,
   resolveCommit,
   resolveVersion
 } = require('./versions')
 
-async function downloadZig (platform, version) {
+const TOOL_NAME = 'zig'
+
+async function downloadZig (arch, platform, version, useCache = true) {
   const ext = extForPlatform(platform)
 
-  const { downloadUrl, variantName } = version.includes('+')
+  const { downloadUrl, variantName, version: useVersion } = version.includes('+')
-    ? resolveCommit(platform, version)
+    ? resolveCommit(arch, platform, version)
-    : await resolveVersion(platform, version)
+    : await resolveVersion(arch, platform, version)
 
-  const downloadPath = await cache.downloadTool(downloadUrl)
+  const cachedPath = toolCache.find(TOOL_NAME, useVersion)
+  if (cachedPath) {
+    actions.info(`using cached zig install: ${cachedPath}`)
+    return cachedPath
+  }
+
+  const cacheKey = `${TOOL_NAME}-${variantName}`
+  if (useCache) {
+    const restorePath = path.join(process.env.RUNNER_TOOL_CACHE, TOOL_NAME, useVersion, arch)
+    actions.info(`attempting restore of ${cacheKey} to ${restorePath}`)
+    const restoredKey = await cache.restoreCache([restorePath], cacheKey)
+    if (restoredKey) {
+      actions.info(`using cached zig install: ${restorePath}`)
+      return restorePath
+    }
+  }
+
+  actions.info(`no cached version found. downloading zig ${variantName}`)
+  const downloadPath = await toolCache.downloadTool(downloadUrl)
   const zigPath = ext === 'zip'
-    ? await cache.extractZip(downloadPath)
+    ? await toolCache.extractZip(downloadPath)
-    : await cache.extractTar(downloadPath, undefined, 'x')
+    : await toolCache.extractTar(downloadPath, undefined, 'x')
 
   const binPath = path.join(zigPath, variantName)
-  const cachePath = await cache.cacheDir(binPath, 'zig', variantName)
+  const cachePath = await toolCache.cacheDir(binPath, TOOL_NAME, useVersion)
+
+  if (useCache) {
+    actions.info(`adding zig ${useVersion} at ${cachePath} to local cache ${cacheKey}`)
+    await cache.saveCache([cachePath], cacheKey)
+  }
 
   return cachePath
 }
 
 async function main () {
-  const version = actions.getInput('version') || '0.5.0'
+  const version = actions.getInput('version') || 'master'
+  const useCache = actions.getInput('cache') || 'true'
   if (semver.valid(version) && semver.lt(version, '0.3.0')) {
     actions.setFailed('This action does not work with Zig 0.1.0 and Zig 0.2.0')
     return
   }
-
+  if (useCache !== 'false' && useCache !== 'true') {
-  let zigPath = cache.find('zig', version)
+    actions.setFailed('`with.cache` must be "true" or "false"')
-  if (!zigPath) {
+    return
-    zigPath = await downloadZig(os.platform(), version)
   }
 
+  const zigPath = await downloadZig(os.arch(), os.platform(), version, useCache === 'true')
+
   // Add the `zig` binary to the $PATH
   actions.addPath(zigPath)
+  actions.info(`zig installed at ${zigPath}`)
 }
 
 main().catch((err) => {

package.json

@@ -1,20 +1,21 @@
 {
   "name": "setup-zig",
   "description": "Use the zig compiler in your Github Action",
-  "version": "1.3.0",
+  "version": "2.2.1",
   "author": "Renée Kooi <renee@kooi.me>",
   "bugs": {
     "url": "https://github.com/goto-bus-stop/setup-zig/issues"
   },
   "dependencies": {
+    "@actions/cache": "^3.2.1",
     "@actions/core": "^1.2.2",
-    "@actions/tool-cache": "^1.3.1",
+    "@actions/tool-cache": "^2.0.1",
     "semver": "^7.1.3",
     "simple-get": "^4.0.0"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.25.0",
+    "esbuild": "^0.20.0",
-    "standard": "^16.0.1"
+    "standard": "^17.0.0"
   },
   "homepage": "https://github.com/goto-bus-stop/setup-zig",
   "keywords": [
@@ -30,7 +31,7 @@
     "url": "https://github.com/goto-bus-stop/setup-zig.git"
   },
   "scripts": {
-    "prepare": "ncc build index.js -o dist",
+    "prepare": "esbuild index.js --outdir=dist --keep-names --bundle --platform=node --target=node20",
     "test": "standard && node test"
   },
   "standard": {

test.js

@@ -5,25 +5,35 @@ const {
 } = require('./versions')
 
 async function test () {
-  assert.deepEqual(resolveCommit('linux', '0.6.0+4b48fccad'), {
+  assert.deepEqual(resolveCommit('x64', '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'
+    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('x64', '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'
+    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('x64', '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'
+    variantName: 'zig-linux-x86_64-0.7.0',
+    version: '0.7.0'
   })
-  assert.deepEqual(await resolveVersion('win32', '0.4.0'), {
+  assert.deepEqual(await resolveVersion('x64', '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'
+    variantName: 'zig-windows-x86_64-0.4.0',
+    version: '0.4.0'
   })
-  await assert.doesNotReject(resolveVersion('linux', 'master'))
+  assert.deepEqual(await resolveVersion('arm64', 'darwin', '0.11.0'), {
-  await assert.doesNotReject(resolveVersion('win32', 'master'))
+    downloadUrl: 'https://ziglang.org/download/0.11.0/zig-macos-aarch64-0.11.0.tar.xz',
+    variantName: 'zig-macos-aarch64-0.11.0',
+    version: '0.11.0'
+  })
+  await assert.doesNotReject(resolveVersion('x64', 'linux', 'master'))
+  await assert.doesNotReject(resolveVersion('x64', 'win32', 'master'))
+  await assert.doesNotReject(resolveVersion('arm64', 'darwin', 'master'))
 }
 
 test().catch((error) => {

test/v0.11/build.zig

@@ -0,0 +1,13 @@
+const Build = @import("std").Build;
+
+pub fn build(b: *Build) void {
+    const optimize = b.standardOptimizeOption(.{});
+    const test_build = b.addTest(.{
+        .root_source_file = .{ .path = "src/main.zig" },
+        .optimize = optimize,
+    });
+    const run_test = b.addRunArtifact(test_build);
+
+    const test_step = b.step("test", "Run the app");
+    test_step.dependOn(&run_test.step);
+}

test/v0.11/src/main.zig

@@ -0,0 +1,5 @@
+const debug = @import("std").debug;
+
+test "it works" {
+    debug.assert(1 == 1);
+}

versions.js

@@ -10,18 +10,26 @@ function extForPlatform (platform) {
   }[platform]
 }
 
-function resolveCommit (platform, version) {
+function resolveCommit (arch, platform, version) {
   const ext = extForPlatform(platform)
-  const addrhost = {
+  const resolvedOs = {
-    linux: 'linux-x86_64',
+    linux: 'linux',
-    darwin: 'macos-x86_64',
+    darwin: 'macos',
-    win32: 'windows-x86_64'
+    win32: 'windows'
   }[platform]
 
-  const downloadUrl = `https://ziglang.org/builds/zig-${addrhost}-${version}.${ext}`
+  const resolvedArch = {
-  const variantName = `zig-${addrhost}-${version}`
+    arm: 'armv7a',
+    arm64: 'aarch64',
+    ppc64: 'powerpc64',
+    riscv64: 'riscv64',
+    x64: 'x86_64'
+  }[arch]
 
-  return { downloadUrl, variantName }
+  const downloadUrl = `https://ziglang.org/builds/zig-${resolvedOs}-${resolvedArch}-${version}.${ext}`
+  const variantName = `zig-${resolvedOs}-${resolvedArch}-${version}`
+
+  return { downloadUrl, variantName, version }
 }
 
 function getJSON (opts) {
@@ -36,13 +44,23 @@ function getJSON (opts) {
   })
 }
 
-async function resolveVersion (platform, version) {
+async function resolveVersion (arch, platform, version) {
   const ext = extForPlatform(platform)
-  const host = {
+  const resolvedOs = {
-    linux: 'x86_64-linux',
+    linux: 'linux',
-    darwin: 'x86_64-macos',
+    darwin: 'macos',
-    win32: 'x86_64-windows'
+    win32: 'windows'
-  }[platform] || platform
+  }[platform]
+
+  const resolvedArch = {
+    arm: 'armv7a',
+    arm64: 'aarch64',
+    ppc64: 'powerpc64',
+    riscv64: 'riscv64',
+    x64: 'x86_64'
+  }[arch]
+
+  const host = `${resolvedArch}-${resolvedOs}`
 
   const index = await getJSON({ url: 'https://ziglang.org/download/index.json' })
 
@@ -59,7 +77,7 @@ async function resolveVersion (platform, version) {
   const downloadUrl = meta[host].tarball
   const variantName = path.basename(meta[host].tarball).replace(`.${ext}`, '')
 
-  return { downloadUrl, variantName }
+  return { downloadUrl, variantName, version: useVersion || version }
 }
 
 module.exports = {