From 954fac299f815e87079f588c3efc9c7cc6a09e61 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Fri, 8 Sep 2023 13:35:25 -0600 Subject: [PATCH 1/6] test: windows tarballs --- .github/workflows/test.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea80d00c..3c6abdd2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,27 @@ jobs: uses: salesforcecli/github-workflows/.github/workflows/tarballs.yml@main secrets: inherit + tarballs-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} + - uses: actions/setup-node@v3 + with: + node-version: lts/* + cache: yarn + - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main + - name: pack tarballs + uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd + with: + max_attempts: 3 + command: yarn pack:tarballs + retry_on: error + timeout_minutes: 60 + - run: yarn pack:verify + - run: yarn test:smoke-unix + artifacts: runs-on: ubuntu-latest env: From be7090cc1ca0d69d34a89afd417dab7070f1b965 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Fri, 8 Sep 2023 15:13:34 -0600 Subject: [PATCH 2/6] test: add jit tests --- .github/workflows/test.yml | 26 ++++++--------- package.json | 2 +- yarn.lock | 68 +++++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 39 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c6abdd2..852c8fea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,26 +20,22 @@ jobs: uses: salesforcecli/github-workflows/.github/workflows/tarballs.yml@main secrets: inherit - tarballs-windows: - runs-on: windows-latest + jit-install: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{matrix.os}} + env: + GH_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - with: - token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} - uses: actions/setup-node@v3 with: - node-version: lts/* cache: yarn - - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main - - name: pack tarballs - uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd - with: - max_attempts: 3 - command: yarn pack:tarballs - retry_on: error - timeout_minutes: 60 - - run: yarn pack:verify - - run: yarn test:smoke-unix + - run: yarn install + - run: yarn build + - run: sf-release cli:install:jit:test + - run: yarn sf-release cli:install:jit:test artifacts: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 1e9e246a..0ff9f32d 100644 --- a/package.json +++ b/package.json @@ -233,7 +233,7 @@ "@oclif/plugin-command-snapshot": "^3.3.0", "@salesforce/dev-config": "^4.0.1", "@salesforce/dev-scripts": "^3.1.1", - "@salesforce/plugin-release-management": "^4.1.19", + "@salesforce/plugin-release-management": "^4.1.29-dev.0", "@salesforce/prettier-config": "^0.0.3", "@salesforce/ts-sinon": "^1.4.15", "@types/debug": "^4.1.8", diff --git a/yarn.lock b/yarn.lock index 8adf7446..443ee74c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1561,20 +1561,20 @@ istanbul-lib-report "^3.0.1" istanbul-reports "^3.1.6" -"@salesforce/cli-plugins-testkit@^4.2.9": - version "4.2.9" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.2.9.tgz#813bbb6a7926d17d5d0becd664e08f1c115680d1" - integrity sha512-v71dFmhlgwtmehK2QJ8+toeCYc39WQFu7R2wmhsHQeVA1UuYcx3uue5JnC392PIXddxQtjdR6eazk52tQg4nyA== +"@salesforce/cli-plugins-testkit@^4.3.2": + version "4.3.4" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-4.3.4.tgz#c79df959261d9b7c6360869ba937158d75d31934" + integrity sha512-QcUV83trR9O/uWZApNdPBtBjAWAU4o23FKHpapvfChfqd+1ldgVTFSzipLy3k2eMD8tsOziBQ1Fw0xuiRM+HOQ== dependencies: - "@salesforce/core" "^5.2.0" - "@salesforce/kit" "^3.0.9" - "@salesforce/ts-types" "^2.0.2" + "@salesforce/core" "^5.2.5" + "@salesforce/kit" "^3.0.11" + "@salesforce/ts-types" "^2.0.6" "@types/shelljs" "^0.8.12" debug "^4.3.1" jszip "^3.10.1" shelljs "^0.8.4" strip-ansi "6.0.1" - ts-retry-promise "^0.7.0" + ts-retry-promise "^0.7.1" "@salesforce/core@^5.2.0", "@salesforce/core@^5.2.1", "@salesforce/core@^5.2.5", "@salesforce/core@^5.2.6": version "5.2.6" @@ -1797,31 +1797,32 @@ open "^8.4.2" tslib "^2" -"@salesforce/plugin-release-management@^4.1.19": - version "4.1.19" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-release-management/-/plugin-release-management-4.1.19.tgz#2ff5533a24dadf6b7f999462bf233ce5e817ef15" - integrity sha512-LflsY09sqbGay8/YszzGB62M8CRmoab5/LB0sFppvfBbTLgjDzCuPZkIWd+vR6d+v5nUfoR5OuLSV4l3zGXOOA== +"@salesforce/plugin-release-management@^4.1.29-dev.0": + version "4.1.29-dev.0" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-release-management/-/plugin-release-management-4.1.29-dev.0.tgz#d4caf5bb51e554e5da6bb15e71bd9ee67f0a4a81" + integrity sha512-bCk3Jir3EfXSorsXziv0Zmkf0PNiQtNFNmwzVEKRTq8eBrZF0KNQ8PB6NoImvKmDmZCDhZOlACqy0Hi2pyEAwA== dependencies: - "@oclif/core" "^2.11.7" + "@oclif/core" "^2.15.0" "@octokit/core" "^4.2.4" "@octokit/plugin-paginate-rest" "^6.1.2" "@octokit/plugin-throttling" "^5.2.3" - "@salesforce/cli-plugins-testkit" "^4.2.9" + "@salesforce/cli-plugins-testkit" "^4.3.2" "@salesforce/core" "^5.2.0" "@salesforce/kit" "^3.0.9" "@salesforce/plugin-command-reference" "^3.0.25" - "@salesforce/plugin-trust" "^2.4.2" - "@salesforce/sf-plugins-core" "^3.1.14" + "@salesforce/plugin-trust" "^2.6.8" + "@salesforce/sf-plugins-core" "^3.1.20" "@salesforce/ts-types" "^2.0.6" - aws-sdk "^2.1413.0" + aws-sdk "^2.1440.0" chalk "^4.1.0" - fast-glob "^3.3.0" + fast-glob "^3.3.1" got "^11.8.6" just-diff "^5.2.0" proxy-agent "^6.3.0" semver "^7.5.2" shelljs "^0.8.4" standard-version "^9.0.0" + strip-ansi "^6" tslib "^2" yarn-deduplicate "^3.1.0" @@ -1904,7 +1905,7 @@ yeoman-environment "^3.19.3" yeoman-generator "^5.9.0" -"@salesforce/plugin-trust@2.6.9", "@salesforce/plugin-trust@^2.4.2": +"@salesforce/plugin-trust@2.6.9", "@salesforce/plugin-trust@^2.6.8": version "2.6.9" resolved "https://registry.yarnpkg.com/@salesforce/plugin-trust/-/plugin-trust-2.6.9.tgz#8bcdd3e87c414ffd80da3a5ec0aadd4f9db5642d" integrity sha512-kVQixGAZUxkBKSvbdsEB3rjo2X8k2G9EjzLTaL53NWL2vNxwjZvmzPkw2rmZm1Wr5ed1TA1lEIm1jwLvh2kPPg== @@ -2026,7 +2027,7 @@ sinon "^5.1.1" tslib "^2.6.1" -"@salesforce/ts-types@^2.0.2", "@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.7": +"@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.7.tgz#02a6999d0b0e7bcd6c6d8ce621c79fa61af24701" integrity sha512-8csXgstPuy6QXL3JavkIi/f8DOWHBNCvWeszrFu5sbVlcKO3YqOOCE+rDFGPkrZsYv5OywV6H8kEi877bWOz6Q== @@ -2926,7 +2927,7 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sdk@^2.1231.0, aws-sdk@^2.1413.0, aws-sdk@^2.1450.0: +aws-sdk@^2.1231.0, aws-sdk@^2.1450.0: version "2.1450.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1450.0.tgz#d54a0bfc6d54391b3d39ff73c0398f435082c14c" integrity sha512-EfZLImJ0XNuIdlx5McHX0rJbOiQHz+vEjnpGV08gXSzaq2cN3vSjE+L2Dju7KmaIh85FTYvLOf2REUuCLDpSRg== @@ -2942,6 +2943,22 @@ aws-sdk@^2.1231.0, aws-sdk@^2.1413.0, aws-sdk@^2.1450.0: uuid "8.0.0" xml2js "0.5.0" +aws-sdk@^2.1440.0: + version "2.1454.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1454.0.tgz#4fa177e8bd2cee4b785a29f3da3756d6404f937d" + integrity sha512-k+wBy+ev2HWawdfYlZqGMD4WI8zyS+r6t1hc8pwSxm3s8wjP69s8df4LjUaMxMwK8xu7UscVVsXJBpMMsXFhew== + dependencies: + buffer "4.9.2" + events "1.1.1" + ieee754 "1.1.13" + jmespath "0.16.0" + querystring "0.2.0" + sax "1.2.1" + url "0.10.3" + util "^0.12.4" + uuid "8.0.0" + xml2js "0.5.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -5054,7 +5071,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: +fast-glob@^3.0.3, fast-glob@^3.2.9, fast-glob@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== @@ -9834,7 +9851,7 @@ stringify-package@^1.0.1: resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -10144,6 +10161,11 @@ ts-retry-promise@^0.7.0: resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.7.0.tgz#08f2dcbbf5d2981495841cb63389a268324e8147" integrity sha512-x6yWZXC4BfXy4UyMweOFvbS1yJ/Y5biSz/mEPiILtJZLrqD3ZxIpzVOGGgifHHdaSe3WxzFRtsRbychI6zofOg== +ts-retry-promise@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.7.1.tgz#176d6eee6415f07b6c7c286d3657355e284a6906" + integrity sha512-NhHOCZ2AQORvH42hOPO5UZxShlcuiRtm7P2jIq2L2RY3PBxw2mLnUsEdHrIslVBFya1v5aZmrR55lWkzo13LrQ== + tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2: version "3.14.2" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" From 10e00534717c8b5cec77b4f2eac7d308668d4121 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Fri, 8 Sep 2023 15:15:48 -0600 Subject: [PATCH 3/6] chore: remove extraneous run --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 852c8fea..3d7b2389 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,6 @@ jobs: cache: yarn - run: yarn install - run: yarn build - - run: sf-release cli:install:jit:test - run: yarn sf-release cli:install:jit:test artifacts: From 91a5b9c88affec4aacec2f4052a09db5a53147a9 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Fri, 8 Sep 2023 15:46:55 -0600 Subject: [PATCH 4/6] test: generate manifest first --- .github/workflows/test.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d7b2389..41af9fbb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,13 +20,27 @@ jobs: uses: salesforcecli/github-workflows/.github/workflows/tarballs.yml@main secrets: inherit + manifest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + cache: yarn + - run: yarn install + - run: yarn build + - run: yarn oclif manifest + - uses: actions/upload-artifact@v2 + with: + name: manifest + path: oclif.manifest.json + jit-install: + needs: [manifest] strategy: matrix: os: [ubuntu-latest, windows-latest] runs-on: ${{matrix.os}} - env: - GH_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -34,6 +48,9 @@ jobs: cache: yarn - run: yarn install - run: yarn build + - uses: actions/download-artifact@v2 + with: + name: manifest - run: yarn sf-release cli:install:jit:test artifacts: From a41ca25208882dfff2744a1a9a75739d1ea759df Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Wed, 13 Sep 2023 14:53:36 -0600 Subject: [PATCH 5/6] fix: remove --cli from smoke tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ff9f32d..07452872 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "promote:verify-rc": "sf-release cli:versions:inspect --channels stable-rc --locations archive --cli sf", "test": "sf-test", "test:deprecation-policy": "sf-release cli:artifacts:compare", - "test:smoke-unix": "sf-release cli:tarballs:smoke --cli sf", + "test:smoke-unix": "sf-release cli:tarballs:smoke", "upload:deb": "oclif upload:deb", "upload:macos": "oclif upload:macos", "upload:tarballs": "oclif upload:tarballs --xz", From e025887732778639706a8f18b8aa3881cf7ed28a Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Wed, 13 Sep 2023 16:38:16 -0500 Subject: [PATCH 6/6] chore: bump rel-man --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07452872..a70a5149 100644 --- a/package.json +++ b/package.json @@ -233,7 +233,7 @@ "@oclif/plugin-command-snapshot": "^3.3.0", "@salesforce/dev-config": "^4.0.1", "@salesforce/dev-scripts": "^3.1.1", - "@salesforce/plugin-release-management": "^4.1.29-dev.0", + "@salesforce/plugin-release-management": "^4.2.0", "@salesforce/prettier-config": "^0.0.3", "@salesforce/ts-sinon": "^1.4.15", "@types/debug": "^4.1.8",