From 6a501a17dfdcdf205fb9145f5ce3ac4c1008cc32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Nov 2023 17:21:12 +0000 Subject: [PATCH 1/7] fix(deps): update dependency app-builder-bin to v4.2.0 --- packages/builder-util/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index 6eb6763dc1d..cec0b8f6b0e 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -17,7 +17,7 @@ "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", - "app-builder-bin": "4.0.0", + "app-builder-bin": "4.2.0", "bluebird-lst": "^1.0.9", "builder-util-runtime": "workspace:*", "chalk": "^4.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23573c6e5eb..f5dae552d63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -280,8 +280,8 @@ importers: specifier: ^4.1.6 version: 4.1.7 app-builder-bin: - specifier: 4.0.0 - version: 4.0.0 + specifier: 4.2.0 + version: 4.2.0 bluebird-lst: specifier: ^1.0.9 version: 1.0.9 @@ -3270,8 +3270,8 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /app-builder-bin@4.0.0: - resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==} + /app-builder-bin@4.2.0: + resolution: {integrity: sha512-PGXlkukQnroTgAaDZnnppdLzsRJmab6Rh/rJ5fKyYaYhd+FfaORH59/ArkB5dr2cAeYQU5lCeHFEwURaoBO8BA==} dev: false /archiver-utils@2.1.0: From e94e2e6e819d53c7a868a3c0687f703170960c84 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Sun, 12 Nov 2023 09:52:30 -0800 Subject: [PATCH 2/7] chmod app-builder-bin --- packages/builder-util/src/util.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index a54cab954b1..15fb68d6295 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -357,6 +357,7 @@ export async function executeAppBuilder( maxRetries = 0 ): Promise { const command = appBuilderPath + await chmod(command, 0o755) await chmod(path7za, 0o755) const env: any = { ...process.env, From 032cc1d13cf3e520ca6d796361bdc9457a7044d9 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Thu, 14 Mar 2024 11:16:40 -0700 Subject: [PATCH 3/7] updating app-builder-bin to v5.0.0-alpha.0 to test new changes --- packages/builder-util/package.json | 2 +- packages/builder-util/src/util.ts | 2 -- pnpm-lock.yaml | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index 9a70949e69a..a81fcdc70e7 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -17,7 +17,7 @@ "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", - "app-builder-bin": "4.2.0", + "app-builder-bin": "v5.0.0-alpha.0", "bluebird-lst": "^1.0.9", "builder-util-runtime": "workspace:*", "chalk": "^4.1.2", diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index b11bd57550d..e6175d4d8a8 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -10,7 +10,6 @@ import * as path from "path" import { debug, log } from "./log" import { install as installSourceMap } from "source-map-support" import { getPath7za } from "./7za" -import { chmod } from "fs-extra" if (process.env.JEST_WORKER_ID == null) { installSourceMap() @@ -365,7 +364,6 @@ export async function executeAppBuilder( maxRetries = 0 ): Promise { const command = appBuilderPath - await chmod(command, 0o755) const env: any = { ...process.env, SZA_PATH: await getPath7za(), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6924e33d41c..8671fa3fef2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -280,8 +280,8 @@ importers: specifier: ^4.1.6 version: 4.1.7 app-builder-bin: - specifier: 4.2.0 - version: 4.2.0 + specifier: v5.0.0-alpha.0 + version: 5.0.0-alpha.0 bluebird-lst: specifier: ^1.0.9 version: 1.0.9 @@ -3570,8 +3570,8 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /app-builder-bin@4.2.0: - resolution: {integrity: sha512-PGXlkukQnroTgAaDZnnppdLzsRJmab6Rh/rJ5fKyYaYhd+FfaORH59/ArkB5dr2cAeYQU5lCeHFEwURaoBO8BA==} + /app-builder-bin@5.0.0-alpha.0: + resolution: {integrity: sha512-mrtTg5xk9zBr6epZY/Jrmd6nfqHvnAQhsvvlx/w2PH/z38Gn/LPhIGHTERg6HctL60m1avSmqqfFl+xgUpjCBg==} dev: false /aproba@2.0.0: From f7ac6b8e4da4a6e99862c7b02f2e5800ef9c9186 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Thu, 14 Mar 2024 11:18:45 -0700 Subject: [PATCH 4/7] add back chmod for now --- packages/builder-util/src/util.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index e6175d4d8a8..b11bd57550d 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -10,6 +10,7 @@ import * as path from "path" import { debug, log } from "./log" import { install as installSourceMap } from "source-map-support" import { getPath7za } from "./7za" +import { chmod } from "fs-extra" if (process.env.JEST_WORKER_ID == null) { installSourceMap() @@ -364,6 +365,7 @@ export async function executeAppBuilder( maxRetries = 0 ): Promise { const command = appBuilderPath + await chmod(command, 0o755) const env: any = { ...process.env, SZA_PATH: await getPath7za(), From cdb66106cb1501ea044f1abfc48840e9984f57dd Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Thu, 14 Mar 2024 19:24:35 -0700 Subject: [PATCH 5/7] test new release of app-builder-bin --- packages/builder-util/package.json | 2 +- packages/builder-util/src/util.ts | 2 -- pnpm-lock.yaml | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index a81fcdc70e7..5d146a09d15 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -17,7 +17,7 @@ "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", - "app-builder-bin": "v5.0.0-alpha.0", + "app-builder-bin": "v5.0.0-alpha.1", "bluebird-lst": "^1.0.9", "builder-util-runtime": "workspace:*", "chalk": "^4.1.2", diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index b11bd57550d..e6175d4d8a8 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -10,7 +10,6 @@ import * as path from "path" import { debug, log } from "./log" import { install as installSourceMap } from "source-map-support" import { getPath7za } from "./7za" -import { chmod } from "fs-extra" if (process.env.JEST_WORKER_ID == null) { installSourceMap() @@ -365,7 +364,6 @@ export async function executeAppBuilder( maxRetries = 0 ): Promise { const command = appBuilderPath - await chmod(command, 0o755) const env: any = { ...process.env, SZA_PATH: await getPath7za(), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8671fa3fef2..4d9dfa2d102 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -280,8 +280,8 @@ importers: specifier: ^4.1.6 version: 4.1.7 app-builder-bin: - specifier: v5.0.0-alpha.0 - version: 5.0.0-alpha.0 + specifier: v5.0.0-alpha.1 + version: 5.0.0-alpha.1 bluebird-lst: specifier: ^1.0.9 version: 1.0.9 @@ -3570,8 +3570,8 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /app-builder-bin@5.0.0-alpha.0: - resolution: {integrity: sha512-mrtTg5xk9zBr6epZY/Jrmd6nfqHvnAQhsvvlx/w2PH/z38Gn/LPhIGHTERg6HctL60m1avSmqqfFl+xgUpjCBg==} + /app-builder-bin@5.0.0-alpha.1: + resolution: {integrity: sha512-WDmBK9p27AK+pG1TQh7Q9yUKn+MHqx1RT3MFXF8vI1/5kwCZl512CLX29OOo0/tdRsEXQfffYpBmLbNBrE1HBw==} dev: false /aproba@2.0.0: From 6573840f88237dfdb8fc7363d48f91fd1b554e85 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Thu, 14 Mar 2024 23:19:08 -0700 Subject: [PATCH 6/7] try system mksquashfs --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0232e3c895f..912b91c772e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -50,6 +50,7 @@ jobs: env: TEST_FILES: ${{ matrix.testFiles }} FORCE_COLOR: 1 + USE_SYSTEM_MKSQUASHFS: true test-mac: runs-on: macos-latest From 8773657eb4488de7611793f6acca6bac8009f231 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Sun, 17 Mar 2024 23:23:09 -0700 Subject: [PATCH 7/7] try next version of app-builder-bin --- .github/workflows/test.yaml | 1 - packages/builder-util/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 912b91c772e..0232e3c895f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -50,7 +50,6 @@ jobs: env: TEST_FILES: ${{ matrix.testFiles }} FORCE_COLOR: 1 - USE_SYSTEM_MKSQUASHFS: true test-mac: runs-on: macos-latest diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index 5d146a09d15..3b53170d369 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -17,7 +17,7 @@ "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", - "app-builder-bin": "v5.0.0-alpha.1", + "app-builder-bin": "v5.0.0-alpha.2", "bluebird-lst": "^1.0.9", "builder-util-runtime": "workspace:*", "chalk": "^4.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d9dfa2d102..c38e395dc16 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -280,8 +280,8 @@ importers: specifier: ^4.1.6 version: 4.1.7 app-builder-bin: - specifier: v5.0.0-alpha.1 - version: 5.0.0-alpha.1 + specifier: v5.0.0-alpha.2 + version: 5.0.0-alpha.2 bluebird-lst: specifier: ^1.0.9 version: 1.0.9 @@ -3570,8 +3570,8 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /app-builder-bin@5.0.0-alpha.1: - resolution: {integrity: sha512-WDmBK9p27AK+pG1TQh7Q9yUKn+MHqx1RT3MFXF8vI1/5kwCZl512CLX29OOo0/tdRsEXQfffYpBmLbNBrE1HBw==} + /app-builder-bin@5.0.0-alpha.2: + resolution: {integrity: sha512-0k5iUDX1LipeTtt9OLhxyB6In22fRPA09lhLfx2eBqTffalEkbDwaSEGbm5h6xkyi5A86jOQbZ9uOtL5BWxMIA==} dev: false /aproba@2.0.0: