From 954de13b100bb78680d7797d7c34487eaa5fa2a7 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Fri, 19 Apr 2024 15:27:38 -0400 Subject: [PATCH 1/2] Use Actuated runners for Linux test and publish Change-type: patch Signed-off-by: Kyle Harding --- .github/workflows/flowzone.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index 06b721a54..6376e449d 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -21,6 +21,25 @@ jobs: ) secrets: inherit with: - custom_runs_on: '[["self-hosted","Linux","distro:focal","X64"],["self-hosted","Linux","distro:focal","ARM64"],["macos-12"],["windows-2019"],["macos-latest-xlarge"]]' + custom_test_matrix: > + { + "os": [ + ["actuated-4cpu-8gb"], + ["actuated-arm64-4cpu-8gb"], + ["macos-12"], + ["windows-2019"], + ["macos-latest-xlarge"] + ] + } + custom_publish_matrix: > + { + "os": [ + ["actuated-4cpu-8gb"], + ["actuated-arm64-4cpu-8gb"], + ["macos-12"], + ["windows-2019"], + ["macos-latest-xlarge"] + ] + } github_prerelease: false restrict_custom_actions: false From 6fb65bcf22f4899cc21d647db04cbe381d1fb8a9 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Fri, 19 Apr 2024 15:39:56 -0400 Subject: [PATCH 2/2] Re-run npm install and npm dedupe Signed-off-by: Kyle Harding --- npm-shrinkwrap.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9edda31ed..06a7f884f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1993,9 +1993,9 @@ } }, "node_modules/@oclif/core": { - "version": "3.26.3", - "resolved": "https://registry.npmjs.org/@oclif/core/-/core-3.26.3.tgz", - "integrity": "sha512-e6Vwu+cb2Sn4qFFpmY1fQLRWIY5ugruMuN94xb7+kyUzxrirYjJATPhuCT1G5xj9Dk+hTMH+Sp6XcHcVTS1lHg==", + "version": "3.26.4", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-3.26.4.tgz", + "integrity": "sha512-ntfo2ut7enNtAn/jB/dryMUPBM2Fh8Fydmi3k/Ybo6lCGU/hmsPFkBRjCEJAQMyNkK2yVZARaWogdOrcVgFz+w==", "dependencies": { "@types/cli-progress": "^3.11.5", "ansi-escapes": "^4.3.2", @@ -17264,9 +17264,9 @@ } }, "node_modules/prebuild-install/node_modules/node-abi": { - "version": "3.58.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.58.0.tgz", - "integrity": "sha512-pXY1jnGf5T7b8UNzWzIqf0EkX4bx/w8N2AvwlGnk2SYYA/kzDVPaH0Dh0UG4EwxBB5eKOIZKPr8VAHSHL1DPGg==", + "version": "3.60.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.60.0.tgz", + "integrity": "sha512-zcGgwoXbzw9NczqbGzAWL/ToDYAxv1V8gL1D67ClbdkIfeeDBbY0GelZtC25ayLvVjr2q2cloHeQV1R0QAWqRQ==", "dependencies": { "semver": "^7.3.5" }, @@ -21583,8 +21583,7 @@ "node_modules/unbzip2-stream": { "version": "1.4.2", "resolved": "git+ssh://git@github.com/balena-io-modules/unbzip2-stream.git#4a54f56a25b58950f9e4277c56db2912d62242e7", - "integrity": "sha512-hqSQ+EGPNNs80IGpZszUngM7ttKBCgjRtrw+2PTRDUd1UNvPOoSL4M7V1bDBJXktGv8KaVJFRKk2mWi6RmbiEg==", - "license": "MIT" + "integrity": "sha512-hqSQ+EGPNNs80IGpZszUngM7ttKBCgjRtrw+2PTRDUd1UNvPOoSL4M7V1bDBJXktGv8KaVJFRKk2mWi6RmbiEg==" }, "node_modules/undici-types": { "version": "5.26.5",