Merge pull request #558 from crazy-max/ci-virtualenv

ci: add ubuntu arm runners
docker · Jan 20, 2025 · 6b5c60a · 6b5c60a
2 parents a54d83c + 1b6fc22
commit 6b5c60a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,10 +20,13 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-latest
+          - ubuntu-22.04-arm
         node_version:
           - 20
           - 18
@@ -98,7 +101,7 @@ jobs:
             });
             await core.group(`Set includes`, async () => {
               let includes = [];
-              for (const os of ['ubuntu-latest', 'macos-13', 'windows-latest']) {
+              for (const os of ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'windows-latest']) {
                 for (const test of tests) {
                   if (test === 'docker/install.test.itg.ts') {
                     includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: '27.3.1' });

diff --git a/.github/workflows/virtual-env.yml b/.github/workflows/virtual-env.yml
@@ -24,6 +24,8 @@ jobs:
           - ubuntu-24.04
           - ubuntu-22.04
           - ubuntu-20.04
+          - ubuntu-24.04-arm
+          - ubuntu-22.04-arm
     steps:
       -
         name: File system

diff --git a/__tests__/docker/install.test.ts b/__tests__/docker/install.test.ts
@@ -60,6 +60,7 @@ describe('download', () => {
   ])(
   'acquires %p of docker (%s)', async (source, platformOS) => {
     jest.spyOn(osm, 'platform').mockImplementation(() => platformOS as NodeJS.Platform);
+    jest.spyOn(osm, 'arch').mockImplementation(() => 'x64');
     const install = new Install({
       source: source,
       runDir: tmpDir,