From 7981a28a57965450e200e9f9cbd5597e3ddd98b6 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 17 Jun 2021 16:15:32 +0200 Subject: [PATCH 1/3] test(build): fix test failure introduced on windows --- packages/build/src/packaging/package/tarball.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/packaging/package/tarball.spec.ts b/packages/build/src/packaging/package/tarball.spec.ts index 87e6ce3bdf..7ba492a271 100644 --- a/packages/build/src/packaging/package/tarball.spec.ts +++ b/packages/build/src/packaging/package/tarball.spec.ts @@ -14,7 +14,7 @@ describe('package tarball', () => { const tarname = path.basename(tarball.path).replace(/\.tgz$/, ''); const unzip = spawnSync('tar', [ - 'tf', tarball.path + 'tf', tarball.path, ...(process.platform === 'win32' ? ['--force-local'] : []) ], { encoding: 'utf-8' }); expect(unzip.error).to.be.undefined; expect(unzip.stderr).to.be.empty; From 56e16051fdbd98da7e5817f1924b473f2742cb4d Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 17 Jun 2021 18:39:34 +0200 Subject: [PATCH 2/3] fixup: also try to fix windows pkg test --- .evergreen/test-package-win32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/test-package-win32.sh b/.evergreen/test-package-win32.sh index 2250a71c0a..56d7bc3a11 100644 --- a/.evergreen/test-package-win32.sh +++ b/.evergreen/test-package-win32.sh @@ -2,7 +2,7 @@ if echo "$ARTIFACT_URL" | grep -q .zip; then curl -sSfL "$ARTIFACT_URL" > mongosh.zip export ARTIFACT_PATH="$PWD/mongosh.zip" - (cd /cygdrive/c/Program\ Files/ && rm -rf mongosh && mkdir mongosh && cd mongosh && unzip "$ARTIFACT_PATH" && chmod -v +x bin/*) + (cd /cygdrive/c/Program\ Files/ && rm -rf mongosh && mkdir mongosh && cd mongosh && unzip "$ARTIFACT_PATH" && mv -v */bin . && chmod -v +x bin/*) export PATH="/cygdrive/c/Program Files/mongosh/bin:$PATH" else curl -sSfL "$ARTIFACT_URL" > mongosh.msi From 3b16bedb18abdcfd23a7da7e4cf5c64e3eba971e Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 18 Jun 2021 14:59:53 +0200 Subject: [PATCH 3/3] fixup: hopefully also fix macos pkg failures --- .evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen.yml b/.evergreen.yml index 89bc04e98b..c73e3e3c6c 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -318,7 +318,7 @@ functions: . preload.sh curl -sSfL "$ARTIFACT_URL" > mongosh.zip unzip mongosh.zip - ./bin/mongosh --smokeTests + ./mongosh-*/bin/mongosh --smokeTests } test_artifact_rpmextract: - command: shell.exec