Merge branch 'default' into fix-caching

.github/workflows/ci.yml

@@ -17,11 +17,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-12, macos-latest, windows-latest]
-        zig-version: [0.7.0, 0.8.0, 0.9.0, 0.10.0, 0.11.0]
+        zig-version: [0.11.0, 0.12.0]
+        test-variant: [modern]
         include:
-          - os: ubuntu-latest
+          - { os: ubuntu-latest, zig-version: 0.5.0, test-variant: legacy }
-            zig-version: 0.5.0
+          - { 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
@@ -31,10 +43,10 @@ jobs:
         with:
           version: ${{matrix.zig-version}}
       - name: Run tests (zig up to v0.10.x)
-        if: ${{ !startsWith(matrix.zig-version, '0.11.') }}
+        if: ${{ matrix.test-variant == 'legacy' }}
         run: zig build test
         working-directory: test/v0.10
       - name: Run tests (zig v0.11.x)
-        if: ${{ startsWith(matrix.zig-version, '0.11.') }}
+        if: ${{ matrix.test-variant == 'modern' }}
         run: zig build test
         working-directory: test/v0.11

index.js

@@ -14,7 +14,7 @@ const {
 
 const TOOL_NAME = 'zig'
 
-async function downloadZig (platform, version, useCache = true) {
+async function downloadZig (arch, platform, version, useCache = true) {
   const ext = extForPlatform(platform)
 
   const {
@@ -23,8 +23,8 @@ async function downloadZig (platform, version, useCache = true) {
     variantName,
     version: useVersion
   } = version.includes('+')
-    ? resolveCommit(platform, version)
+    ? resolveCommit(arch, platform, version)
-    : await resolveVersion(platform, version)
+    : await resolveVersion(arch, platform, version)
 
   const cachedPath = toolCache.find(TOOL_NAME, useVersion)
   if (cachedPath) {
@@ -34,7 +34,7 @@ async function downloadZig (platform, version, useCache = true) {
 
   const cacheKey = `${TOOL_NAME}-${variantName}`
   if (useCache) {
-    const restorePath = path.join(process.env.RUNNER_TOOL_CACHE, TOOL_NAME, useVersion, os.arch())
+    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) {
@@ -72,7 +72,7 @@ async function main () {
     return
   }
 
-  const zigPath = await downloadZig(os.platform(), version, useCache === 'true')
+  const zigPath = await downloadZig(os.arch(), os.platform(), version, useCache === 'true')
 
   // Add the `zig` binary to the $PATH
   actions.addPath(zigPath)

test.js

@@ -5,43 +5,49 @@ 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',
     fileWithoutFileType: 'zig-linux-x86_64-0.6.0+4b48fccad',
     variantName: 'zig-linux-x86_64-0.6.0',
     version: '0.6.0'
   })
-  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',
     fileWithoutFileType: 'zig-windows-x86_64-0.6.0+4b48fccad',
     variantName: 'zig-windows-x86_64-0.6.0',
     version: '0.6.0'
   })
-  assert.deepEqual(resolveCommit('win32', '0.12.0-dev.1092+68ed78775'), {
+  assert.deepEqual(resolveCommit('x64', 'win32', '0.12.0-dev.1092+68ed78775'), {
     downloadUrl: 'https://ziglang.org/builds/zig-windows-x86_64-0.12.0-dev.1092+68ed78775.zip',
     fileWithoutFileType: 'zig-windows-x86_64-0.12.0-dev.1092+68ed78775',
     variantName: 'zig-windows-x86_64-0.12.0-dev.1092',
     version: '0.12.0-dev.1092'
   })
-  assert.deepEqual(resolveCommit('darwin', '0.12.0-dev.1150+3c22cecee'), {
+  assert.deepEqual(resolveCommit('x64', 'darwin', '0.12.0-dev.1150+3c22cecee'), {
     downloadUrl: 'https://ziglang.org/builds/zig-macos-x86_64-0.12.0-dev.1150+3c22cecee.tar.xz',
     fileWithoutFileType: 'zig-macos-x86_64-0.12.0-dev.1150+3c22cecee',
     variantName: 'zig-macos-x86_64-0.12.0-dev.1150',
     version: '0.12.0-dev.1150'
   })
 
-  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',
     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',
     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) => {

versions.js

@@ -10,19 +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 fileWithoutFileType = `zig-${addrhost}-${version}`
+  const resolvedArch = {
-  const downloadUrl = `https://ziglang.org/builds/${fileWithoutFileType}.${ext}`
+    arm: 'armv7a',
+    arm64: 'aarch64',
+    ppc64: 'powerpc64',
+    riscv64: 'riscv64',
+    x64: 'x86_64'
+  }[arch]
 
+  const downloadUrl = `https://ziglang.org/builds/zig-${resolvedOs}-${resolvedArch}-${version}.${ext}`
   const versionWithoutBuildHash = semver.clean(version)
-  const variantName = `zig-${addrhost}-${versionWithoutBuildHash}`
+  const fileWithoutFileType = `zig-${resolvedOs}-${resolvedArch}-${version}`
+  const variantName = `zig-${resolvedOs}-${resolvedArch}-${versionWithoutBuildHash}`
 
   return {
     downloadUrl,
@@ -44,13 +51,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' })