From 68c47d9f325c3fcb092e28e5598b50e043d8fee1 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 10:59:47 -0500 Subject: [PATCH 01/52] chore: jit-plugin matrix --- .github/workflows/test.yml | 11 ++++++++++- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 41af9fbb..e381bb59 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,11 +35,20 @@ jobs: name: manifest path: oclif.manifest.json + get-jit-plugins: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: | + JIT=$(jq '.oclif.jitPlugins | keys' package.json) + echo "jit=$JIT" >> "$GITHUB_OUTPUT" + jit-install: needs: [manifest] strategy: matrix: os: [ubuntu-latest, windows-latest] + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 @@ -51,7 +60,7 @@ jobs: - uses: actions/download-artifact@v2 with: name: manifest - - run: yarn sf-release cli:install:jit:test + - run: yarn sf-release cli:install:jit:test --jit-plugins ${{matrix.jitPlugins}} artifacts: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 3e84763e..521ab82f 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,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.2.2", + "@salesforce/plugin-release-management": "^4.3.1-dev.0", "@salesforce/prettier-config": "^0.0.3", "@salesforce/ts-sinon": "^1.4.15", "@types/debug": "^4.1.8", @@ -256,7 +256,7 @@ "husky": "^7.0.4", "mocha": "^9.2.2", "nyc": "^15.1.0", - "oclif": "^3.16.0", + "oclif": "^3.17.1", "prettier": "^2.8.8", "pretty-quick": "^3.1.3", "sinon": "^11.1.2", diff --git a/yarn.lock b/yarn.lock index 1ee1b8f4..21f24f8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1797,10 +1797,10 @@ open "^8.4.2" tslib "^2" -"@salesforce/plugin-release-management@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-release-management/-/plugin-release-management-4.2.2.tgz#6187b91dc5b0d527ac31c68810eb2439e6808a39" - integrity sha512-vMw9O1z89MTnS4lRJ1ktGMrthYRIcMS8K7ceDVAsKydYryuaCxD4Ak+OA59/K+ihJ9fjjzkzqsWNt+NENDMwRQ== +"@salesforce/plugin-release-management@^4.3.1-dev.0": + version "4.3.1-dev.0" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-release-management/-/plugin-release-management-4.3.1-dev.0.tgz#5d893c0823479108856fb9db8c33561c92e12397" + integrity sha512-0GWkRqum5ar3/SSumuD8k4J+nr4wGFfbHyHtgYn6cSZTSs6ll+VaUNxs4rk/0tCJw6EYC/iPgCTt5A6IzwYoFw== dependencies: "@oclif/core" "^2.15.0" "@octokit/core" "^4.2.4" @@ -8219,10 +8219,10 @@ object.values@^1.1.5, object.values@^1.1.6: define-properties "^1.1.4" es-abstract "^1.20.4" -oclif@^3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.16.0.tgz#b1983f310cbb25944d7da02125aa0c095aa7669d" - integrity sha512-qbPJ9SifBDPeMnuYIyJc0+kGyXmLubJs/lOD1wjrvAiKqTWQ1xy/EFlNMgBGETCf7RQf1iSJmvf+s22ZkLc7Ow== +oclif@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.17.1.tgz#be210c063d4e78995b8dab594c3a220c4cf17710" + integrity sha512-qwop0W9s5nJJ9tTdLsYXxxvGSNc9xKjXccEAGCXM+x8NmGtZ4P89FwqDY4PIG7IeV9VNpYhZKQArpZNwPGn0CQ== dependencies: "@oclif/core" "^2.11.4" "@oclif/plugin-help" "^5.2.14" From a28887ef2c97644c57edc8519d465d6e6da30e19 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:12:51 -0500 Subject: [PATCH 02/52] chore: try quotes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e381bb59..402bef41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: - uses: actions/checkout@v3 - run: | JIT=$(jq '.oclif.jitPlugins | keys' package.json) - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit='$JIT'" >> "$GITHUB_OUTPUT" jit-install: needs: [manifest] From e4fd914ee2e8ddcc96f90f8eee73c01bc2180a19 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:16:15 -0500 Subject: [PATCH 03/52] chore: trying without fromJson --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 402bef41..c4965adf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,14 +41,14 @@ jobs: - uses: actions/checkout@v3 - run: | JIT=$(jq '.oclif.jitPlugins | keys' package.json) - echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + echo "jit=$JIT" >> "$GITHUB_OUTPUT" jit-install: needs: [manifest] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 1af1e351be7525d4306ff9905c4327c4dd2f976e Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:21:14 -0500 Subject: [PATCH 04/52] chore: try removing newlines --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c4965adf..58c0ac94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq '.oclif.jitPlugins | keys' package.json) + JIT=$(jq '.oclif.jitPlugins | keys' package.json | tr -d '\n') echo "jit=$JIT" >> "$GITHUB_OUTPUT" jit-install: @@ -48,7 +48,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From f7ab839bea535091f0bf6dd7f6e44b7698e28ce9 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:23:56 -0500 Subject: [PATCH 05/52] chore: add needs --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 58c0ac94..ccb55129 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,7 @@ jobs: echo "jit=$JIT" >> "$GITHUB_OUTPUT" jit-install: - needs: [manifest] + needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] From bc322460dcea056442a753d5aa905b43e7801337 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:29:14 -0500 Subject: [PATCH 06/52] chore: add echo --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccb55129..6e6e2915 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,6 +41,8 @@ jobs: - uses: actions/checkout@v3 - run: | JIT=$(jq '.oclif.jitPlugins | keys' package.json | tr -d '\n') + echo "Found JIT plugins:" + echo "$JIT" echo "jit=$JIT" >> "$GITHUB_OUTPUT" jit-install: From 5428fec4e810430e86f2dce6cb5972ca97e8387c Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 11:44:05 -0500 Subject: [PATCH 07/52] chore: testing hardcoded values --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e6e2915..9fe54bdc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,9 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: + - '@salesforce/plugin-community' + - '@salesforce/plugin-env' runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 @@ -62,7 +64,7 @@ jobs: - uses: actions/download-artifact@v2 with: name: manifest - - run: yarn sf-release cli:install:jit:test --jit-plugins ${{matrix.jitPlugins}} + - run: yarn sf-release cli:install:jit:test --jit-plugin ${{matrix.jitPlugins}} artifacts: runs-on: ubuntu-latest From a7498e42db06978cbca39a15c3c6ad65f3c75acd Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 13:31:30 -0500 Subject: [PATCH 08/52] chore: echo fromJSON output --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fe54bdc..b8061f7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,6 +45,13 @@ jobs: echo "$JIT" echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo-jit-plugins: + needs: get-jit-plugins + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jit-install: needs: [manifest, get-jit-plugins] strategy: From 755cfee7d9dcc96d1066f149c0de719a5af3cf61 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 13:36:31 -0500 Subject: [PATCH 09/52] chore: compact jq --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b8061f7b..c9b1375a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq '.oclif.jitPlugins | keys' package.json | tr -d '\n') + JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" echo "jit=$JIT" >> "$GITHUB_OUTPUT" From f78d4812b4e0927e1c0d1b0f049c96a8d1a6d5be Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 13:48:47 -0500 Subject: [PATCH 10/52] chore: tojson --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9b1375a..e5b97ba3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + - run: | + echo "JIT to JSON:" + echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} + echo "JIT from JSON:" + echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: needs: [manifest, get-jit-plugins] From 16f122b2a7a6956b27c5cc5e2bdf5d14afc4f292 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 13:53:29 -0500 Subject: [PATCH 11/52] chore: single quotes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5b97ba3..d57eceaa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit='$JIT'" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins From 3647c4c8fba479cf3269c775b936e9e3c4d1fc37 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 13:59:26 -0500 Subject: [PATCH 12/52] chore: more quotes --- .github/workflows/test.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d57eceaa..f8b17ae5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,9 +40,9 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) + JIT=$(jq '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" - echo "$JIT" + echo "'$JIT'" echo "jit='$JIT'" >> "$GITHUB_OUTPUT" echo-jit-plugins: @@ -61,9 +61,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: - - '@salesforce/plugin-community' - - '@salesforce/plugin-env' + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 58ac5e0e869569aaa5e0fcbdbc2ee37a6a4e4134 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 14:35:44 -0500 Subject: [PATCH 13/52] chore: remove fromjson --- .github/workflows/test.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8b17ae5..09808688 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,28 +40,28 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq '.oclif.jitPlugins | keys' package.json) + JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" - echo "'$JIT'" - echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + echo "$JIT" + echo "jit=$JIT" >> "$GITHUB_OUTPUT" - echo-jit-plugins: - needs: get-jit-plugins - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: | - echo "JIT to JSON:" - echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} - echo "JIT from JSON:" - echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + # echo-jit-plugins: + # needs: get-jit-plugins + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - run: | + # echo "JIT to JSON:" + # echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} + # echo "JIT from JSON:" + # echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From d91c01212f2bb3adf7912d4f7503b9ecc54a71e9 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 14:43:52 -0500 Subject: [PATCH 14/52] chore: manual input --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 09808688..5c6b5f24 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} + jitPlugins: ['@salesforce/plugin-community', '@salesforce/plugin-custom-metadata'] runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From a0a4754a807d702f403f0bd0e3b4f7ea5b12c8b3 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 14:48:35 -0500 Subject: [PATCH 15/52] chore: double --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c6b5f24..782795a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ['@salesforce/plugin-community', '@salesforce/plugin-custom-metadata'] + jitPlugins: ["@salesforce/plugin-community","@salesforce/plugin-custom-metadata"] runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From d859cd6d9c91f63493a63ef422aea7f30286788f Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 14:58:15 -0500 Subject: [PATCH 16/52] chore: why --- .github/workflows/test.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 782795a0..403a4e8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,25 +43,23 @@ jobs: JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit='$JIT'" >> "$GITHUB_OUTPUT" - # echo-jit-plugins: - # needs: get-jit-plugins - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - run: | - # echo "JIT to JSON:" - # echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} - # echo "JIT from JSON:" - # echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + echo-jit-plugins: + needs: get-jit-plugins + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: | + echo "JIT from JSON:" + echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ["@salesforce/plugin-community","@salesforce/plugin-custom-metadata"] + jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From c020bf4fa24db69b5c83d4af28be6e2c29333330 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:12:17 -0500 Subject: [PATCH 17/52] chore: as object --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 403a4e8d..fc2893ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,10 +40,10 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) + JIT=$(jq -c '{ plugins: .oclif.jitPlugins | keys }' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + echo "jit=$JIT" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins @@ -52,14 +52,14 @@ jobs: - uses: actions/checkout@v3 - run: | echo "JIT from JSON:" - echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit).plugins }} jit-install: needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit).plugins }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 037a4f0d7929d487e1caadd82edb31848b7e9117 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:15:12 -0500 Subject: [PATCH 18/52] chore: single quotes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc2893ca..f3b3f4cf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: JIT=$(jq -c '{ plugins: .oclif.jitPlugins | keys }' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit='$JIT'" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins From a160443d24b985d944d5a4a82d270344b1af0245 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:20:11 -0500 Subject: [PATCH 19/52] chore: tojson frist --- .github/workflows/test.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3b3f4cf..8c94294d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,10 +40,11 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - JIT=$(jq -c '{ plugins: .oclif.jitPlugins | keys }' package.json) + JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) + JIT_JSON='${{ toJson($JIT) }}' echo "Found JIT plugins:" - echo "$JIT" - echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + echo "$JIT_JSON" + echo "jit=$JIT_JSON" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins @@ -51,15 +52,17 @@ jobs: steps: - uses: actions/checkout@v3 - run: | + echo "JIT JSON:" + echo ${{ needs.get-jit-plugins.outputs.jit }} echo "JIT from JSON:" - echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit).plugins }} + echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit).plugins }} + jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 45edef6ccf58dcd2669059785ba5900a2e5e187f Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:22:30 -0500 Subject: [PATCH 20/52] chore: tojson --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c94294d..19fb9704 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,10 +41,10 @@ jobs: - uses: actions/checkout@v3 - run: | JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) - JIT_JSON='${{ toJson($JIT) }}' echo "Found JIT plugins:" - echo "$JIT_JSON" - echo "jit=$JIT_JSON" >> "$GITHUB_OUTPUT" + echo "$JIT" + echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v3 - run: | echo "JIT JSON:" - echo ${{ needs.get-jit-plugins.outputs.jit }} + echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} echo "JIT from JSON:" echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} From b19d9dd37d64e0ec40d4691ebe93c58bc37354e8 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:26:50 -0500 Subject: [PATCH 21/52] chore: seperate steps --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19fb9704..506edfcd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,6 @@ jobs: echo "Found JIT plugins:" echo "$JIT" echo "jit=$JIT" >> "$GITHUB_OUTPUT" - echo "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins @@ -52,8 +51,9 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - echo "JIT JSON:" - echo ${{ toJson(needs.get-jit-plugins.outputs.jit) }} + echo "JIT to JSON:" + echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} + - run: | echo "JIT from JSON:" echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} From 375795be93277a550600b988907d23d073ffe363 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 15:32:19 -0500 Subject: [PATCH 22/52] chore: more logging --- .github/workflows/test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 506edfcd..41efa974 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,8 @@ jobs: get-jit-plugins: runs-on: ubuntu-latest + outputs: + jit: ${{ steps.get-jit-plugins.outputs.jit }} steps: - uses: actions/checkout@v3 - run: | @@ -50,6 +52,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: | + echo "JIT:" + echo ${{ needs.get-jit-plugins.outputs.jit }} + - run: | + echo "Steps": + echo ${{ toJSON(job)}} - run: | echo "JIT to JSON:" echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} From a5dd08a7c5558dc974f5d73541ab582caa1a13ca Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:04:51 -0500 Subject: [PATCH 23/52] chore: outputs --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 41efa974..0751d686 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,10 +38,12 @@ jobs: get-jit-plugins: runs-on: ubuntu-latest outputs: - jit: ${{ steps.get-jit-plugins.outputs.jit }} + jit: ${{ steps.plugins.outputs.jit }} steps: - uses: actions/checkout@v3 - - run: | + - name: Get JIT plugins + id: plugins + run: | JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" From b2b1ae3c8439960c31c94e45282084f946e0e6b8 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:11:51 -0500 Subject: [PATCH 24/52] chore: remove job echo --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0751d686..a771ce9e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,9 +57,9 @@ jobs: - run: | echo "JIT:" echo ${{ needs.get-jit-plugins.outputs.jit }} - - run: | - echo "Steps": - echo ${{ toJSON(job)}} + # - run: | + # echo "Steps": + # echo ${{ toJSON(job)}} - run: | echo "JIT to JSON:" echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} @@ -72,7 +72,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 2dde5cf61a3024605d1926de81833bb8792329d4 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:15:24 -0500 Subject: [PATCH 25/52] chore: toJson in needs --- .github/workflows/test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a771ce9e..c963e0a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,9 +57,6 @@ jobs: - run: | echo "JIT:" echo ${{ needs.get-jit-plugins.outputs.jit }} - # - run: | - # echo "Steps": - # echo ${{ toJSON(job)}} - run: | echo "JIT to JSON:" echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} @@ -72,7 +69,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} + jitPlugins: ${{ toJson(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From d59adad50daf48afa8b001f932fa0d81dc0cbe8b Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:18:00 -0500 Subject: [PATCH 26/52] chore: single quotes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c963e0a8..056e976b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,7 +47,7 @@ jobs: JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit='$JIT'" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins From 1855fa1cce07d5bafc3b8f8df586c45cd4d0afbb Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:20:47 -0500 Subject: [PATCH 27/52] chore: fromjson --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 056e976b..2ae8ddfc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ toJson(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ fromJson(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 520d58696efaa4883e3247d5d30d4300819b2a4b Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:27:17 -0500 Subject: [PATCH 28/52] chore: fromJSON --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ae8ddfc..d814121c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJson(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 6527b1a58bee1c43cb4a525c8b4e13d0f46dedd3 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:30:56 -0500 Subject: [PATCH 29/52] chore: to and from json --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d814121c..4c137f37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + jitPlugins: ${{ toJSON(fromJSON(needs.get-jit-plugins.outputs.jit)) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From a645059df21d61419a195cb4df9ea42efb72acc5 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:33:37 -0500 Subject: [PATCH 30/52] chore: no json --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c137f37..3b23f7ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ toJSON(fromJSON(needs.get-jit-plugins.outputs.jit)) }} + jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From 366464d31b033b828d2778439d0b5fce15a2445f Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:41:20 -0500 Subject: [PATCH 31/52] chore: json job --- .github/workflows/test.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b23f7ba..4e3948ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,6 +49,20 @@ jobs: echo "$JIT" echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + get-jit-plugins-json: + runs-on: ubuntu-latest + needs: get-jit-plugins + outputs: + jitJson: ${{ steps.jitJson.outputs.jitJson }} + steps: + - name: Get JIT plugins JSON + id: jitJson + run: | + JSON='${{ toJSON(steps.plugins.outputs.jit) }}' + echo "JIT JSON:" + echo "$JSON" + echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" + echo-jit-plugins: needs: get-jit-plugins runs-on: ubuntu-latest @@ -65,11 +79,11 @@ jobs: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: - needs: [manifest, get-jit-plugins] + needs: [manifest, get-jit-plugins-json] strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} + jitPlugins: ${{ fromJSON(needs.get-jit-plugins-json.outputs.jitJson) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From d271d70d00becabb798b525abae8c47fa4e1e0ce Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:43:11 -0500 Subject: [PATCH 32/52] chore: needs not step --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e3948ca..9fab50e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest needs: get-jit-plugins outputs: - jitJson: ${{ steps.jitJson.outputs.jitJson }} + jitJson: ${{ needs.jitJson.outputs.jitJson }} steps: - name: Get JIT plugins JSON id: jitJson From ec26bca806a8a8f84ac26b5354c85fdaa13e729e Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 16:48:39 -0500 Subject: [PATCH 33/52] chore: swap --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fab50e4..48ec08a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,12 +53,12 @@ jobs: runs-on: ubuntu-latest needs: get-jit-plugins outputs: - jitJson: ${{ needs.jitJson.outputs.jitJson }} + jitJson: ${{ steps.jitJson.outputs.jitJson }} steps: - name: Get JIT plugins JSON id: jitJson run: | - JSON='${{ toJSON(steps.plugins.outputs.jit) }}' + JSON='${{ toJSON(needs.get-jit-plugins.outputs.jit) }}' echo "JIT JSON:" echo "$JSON" echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" From 8784fb3743985210afe64351a8c32682bc170485 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 17:00:17 -0500 Subject: [PATCH 34/52] chore: tostring --- .github/workflows/test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 48ec08a5..1ae2271d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,10 +44,11 @@ jobs: - name: Get JIT plugins id: plugins run: | - JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) + JIT=$(jq -c '.oclif.jitPlugins | keys | tostring' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit='$JIT'" >> "$GITHUB_OUTPUT" + echo $JIT + echo "jit=$JIT" >> "$GITHUB_OUTPUT" get-jit-plugins-json: runs-on: ubuntu-latest @@ -83,7 +84,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ fromJSON(needs.get-jit-plugins-json.outputs.jitJson) }} + jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From bbc0398710aa6e77bd5f2114da75b22c9876fa9d Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 22 Sep 2023 17:02:56 -0500 Subject: [PATCH 35/52] chore: fromJSON --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ae2271d..bb21837a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -84,7 +84,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jitPlugins: ${{ needs.get-jit-plugins.outputs.jit }} + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From a1c85acaa5defcb5a2c9e11dde6bcec2ab5a5d59 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:33:46 -0500 Subject: [PATCH 36/52] chore: tojson in outputs --- .github/workflows/test.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bb21837a..5bf7f45d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,31 +38,30 @@ jobs: get-jit-plugins: runs-on: ubuntu-latest outputs: - jit: ${{ steps.plugins.outputs.jit }} + jit: ${{ toJSON(steps.plugins.outputs.jit) }} steps: - uses: actions/checkout@v3 - name: Get JIT plugins id: plugins run: | - JIT=$(jq -c '.oclif.jitPlugins | keys | tostring' package.json) + JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo $JIT echo "jit=$JIT" >> "$GITHUB_OUTPUT" - get-jit-plugins-json: - runs-on: ubuntu-latest - needs: get-jit-plugins - outputs: - jitJson: ${{ steps.jitJson.outputs.jitJson }} - steps: - - name: Get JIT plugins JSON - id: jitJson - run: | - JSON='${{ toJSON(needs.get-jit-plugins.outputs.jit) }}' - echo "JIT JSON:" - echo "$JSON" - echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" + # get-jit-plugins-json: + # runs-on: ubuntu-latest + # needs: get-jit-plugins + # outputs: + # jitJson: ${{ steps.jitJson.outputs.jitJson }} + # steps: + # - name: Get JIT plugins JSON + # id: jitJson + # run: | + # JSON='${{ toJSON(needs.get-jit-plugins.outputs.jit) }}' + # echo "JIT JSON:" + # echo "$JSON" + # echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" echo-jit-plugins: needs: get-jit-plugins @@ -80,7 +79,7 @@ jobs: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: - needs: [manifest, get-jit-plugins-json] + needs: [manifest] strategy: matrix: os: [ubuntu-latest, windows-latest] From 7493a8df40df0ecba93bc891da9cb2602de5e8af Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:35:35 -0500 Subject: [PATCH 37/52] chore: forgot needs --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bf7f45d..4b35b375 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: - needs: [manifest] + needs: [manifest, get-jit-plugins] strategy: matrix: os: [ubuntu-latest, windows-latest] From 33157d6dda45b578859c014a98d4441faa57ae9f Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:40:33 -0500 Subject: [PATCH 38/52] chore: order --- .github/workflows/test.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b35b375..c516fffe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,6 +36,7 @@ jobs: path: oclif.manifest.json get-jit-plugins: + needs: manifest runs-on: ubuntu-latest outputs: jit: ${{ toJSON(steps.plugins.outputs.jit) }} @@ -63,27 +64,27 @@ jobs: # echo "$JSON" # echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" - echo-jit-plugins: - needs: get-jit-plugins - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: | - echo "JIT:" - echo ${{ needs.get-jit-plugins.outputs.jit }} - - run: | - echo "JIT to JSON:" - echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} - - run: | - echo "JIT from JSON:" - echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + # echo-jit-plugins: + # needs: get-jit-plugins + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - run: | + # echo "JIT:" + # echo ${{ needs.get-jit-plugins.outputs.jit }} + # - run: | + # echo "JIT to JSON:" + # echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} + # - run: | + # echo "JIT from JSON:" + # echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: - needs: [manifest, get-jit-plugins] + needs: [get-jit-plugins] strategy: matrix: - os: [ubuntu-latest, windows-latest] jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + os: [ubuntu-latest, windows-latest] runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From e52896c43caeea7b48097ccf2dcfba9992ed391d Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:50:57 -0500 Subject: [PATCH 39/52] chore: quotes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c516fffe..1f0fdf3a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> "$GITHUB_OUTPUT" + echo "jit=$JIT" >> $GITHUB_OUTPUT # get-jit-plugins-json: # runs-on: ubuntu-latest From 67d9d82e18d2c574c3aa16a5007f92ea25269da6 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:54:18 -0500 Subject: [PATCH 40/52] chore: singlequotes --- .github/workflows/test.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1f0fdf3a..19e9b09b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) echo "Found JIT plugins:" echo "$JIT" - echo "jit=$JIT" >> $GITHUB_OUTPUT + echo "jit='$JIT'" >> $GITHUB_OUTPUT # get-jit-plugins-json: # runs-on: ubuntu-latest @@ -64,20 +64,20 @@ jobs: # echo "$JSON" # echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" - # echo-jit-plugins: - # needs: get-jit-plugins - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - run: | - # echo "JIT:" - # echo ${{ needs.get-jit-plugins.outputs.jit }} - # - run: | - # echo "JIT to JSON:" - # echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} - # - run: | - # echo "JIT from JSON:" - # echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + echo-jit-plugins: + needs: get-jit-plugins + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: | + echo "JIT:" + echo ${{ needs.get-jit-plugins.outputs.jit }} + - run: | + echo "JIT to JSON:" + echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} + - run: | + echo "JIT from JSON:" + echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: needs: [get-jit-plugins] From a7ec57392e9c9d45807dfc0ae09f147a7309fd26 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 09:58:53 -0500 Subject: [PATCH 41/52] chore: wildcard --- .github/workflows/test.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19e9b09b..702fcd27 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,16 +39,20 @@ jobs: needs: manifest runs-on: ubuntu-latest outputs: - jit: ${{ toJSON(steps.plugins.outputs.jit) }} + jit: ${{ toJSON(steps.*.outputs.jit) }} steps: - uses: actions/checkout@v3 - - name: Get JIT plugins - id: plugins - run: | - JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) - echo "Found JIT plugins:" - echo "$JIT" - echo "jit='$JIT'" >> $GITHUB_OUTPUT + - id: comm + run: echo "jit=@salesforce/plugin-community" >> $GITHUB_OUTPUT + - id: env + run: echo "jit=@salesforce/plugin-env" >> $GITHUB_OUTPUT + # - name: Get JIT plugins + # id: plugins + # run: | + # JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) + # echo "Found JIT plugins:" + # echo "$JIT" + # echo "jit='$JIT'" >> $GITHUB_OUTPUT # get-jit-plugins-json: # runs-on: ubuntu-latest From 7f2295a9beeeec39e4b2375a7e760905e38d9e50 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:03:51 -0500 Subject: [PATCH 42/52] chore: oh my it worked, now to tweak it --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 702fcd27..d2d7d976 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,6 @@ jobs: path: oclif.manifest.json get-jit-plugins: - needs: manifest runs-on: ubuntu-latest outputs: jit: ${{ toJSON(steps.*.outputs.jit) }} @@ -84,7 +83,7 @@ jobs: echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} jit-install: - needs: [get-jit-plugins] + needs: [manifest, get-jit-plugins] strategy: matrix: jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} From a585964e14ae20821c1c4b3a1e483e361284092c Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:06:59 -0500 Subject: [PATCH 43/52] chore: non-compact --- .github/workflows/test.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2d7d976..ab235067 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,17 +41,17 @@ jobs: jit: ${{ toJSON(steps.*.outputs.jit) }} steps: - uses: actions/checkout@v3 - - id: comm - run: echo "jit=@salesforce/plugin-community" >> $GITHUB_OUTPUT - - id: env - run: echo "jit=@salesforce/plugin-env" >> $GITHUB_OUTPUT - # - name: Get JIT plugins - # id: plugins - # run: | - # JIT=$(jq -c '.oclif.jitPlugins | keys' package.json) - # echo "Found JIT plugins:" - # echo "$JIT" - # echo "jit='$JIT'" >> $GITHUB_OUTPUT + # - id: comm + # run: echo "jit=@salesforce/plugin-community" >> $GITHUB_OUTPUT + # - id: env + # run: echo "jit=@salesforce/plugin-env" >> $GITHUB_OUTPUT + - name: Get JIT plugins + id: plugins + run: | + JIT=$(jq '.oclif.jitPlugins | keys' package.json) + echo "Found JIT plugins:" + echo "$JIT" + echo "jit='$JIT'" >> $GITHUB_OUTPUT # get-jit-plugins-json: # runs-on: ubuntu-latest From 603949bd497443d91325cadbd2273310a3cf3e6d Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:14:04 -0500 Subject: [PATCH 44/52] chore: eof --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab235067..756a9f4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: get-jit-plugins: runs-on: ubuntu-latest outputs: - jit: ${{ toJSON(steps.*.outputs.jit) }} + jit: ${{ toJSON(steps.plugins.outputs.jit) }} steps: - uses: actions/checkout@v3 # - id: comm @@ -49,9 +49,9 @@ jobs: id: plugins run: | JIT=$(jq '.oclif.jitPlugins | keys' package.json) - echo "Found JIT plugins:" - echo "$JIT" - echo "jit='$JIT'" >> $GITHUB_OUTPUT + echo "jit<> $GITHUB_OUTPUT + echo "$JIT" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT # get-jit-plugins-json: # runs-on: ubuntu-latest From 62e3f9a4746404f34ee62cf06f90503992816c97 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:22:27 -0500 Subject: [PATCH 45/52] chore: hmmm --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 756a9f4b..82763a81 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,9 +49,9 @@ jobs: id: plugins run: | JIT=$(jq '.oclif.jitPlugins | keys' package.json) - echo "jit<> $GITHUB_OUTPUT - echo "$JIT" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT + echo "jit<> "$GITHUB_OUTPUT" + echo "$JIT" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" # get-jit-plugins-json: # runs-on: ubuntu-latest @@ -72,9 +72,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - run: | - echo "JIT:" - echo ${{ needs.get-jit-plugins.outputs.jit }} + # - run: | + # echo "JIT:" + # echo ${{ needs.get-jit-plugins.outputs.jit }} - run: | echo "JIT to JSON:" echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} From 137d67d9f129c5e28d8145ffae686c6d21985b12 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:49:54 -0500 Subject: [PATCH 46/52] chore: different format --- .github/workflows/test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82763a81..cb0dbee2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,10 +48,11 @@ jobs: - name: Get JIT plugins id: plugins run: | - JIT=$(jq '.oclif.jitPlugins | keys' package.json) - echo "jit<> "$GITHUB_OUTPUT" - echo "$JIT" >> "$GITHUB_OUTPUT" - echo "EOF" >> "$GITHUB_OUTPUT" + { + echo 'jit<> "$GITHUB_OUTPUT" # get-jit-plugins-json: # runs-on: ubuntu-latest From ba7dfe7485ab781601916e8fca0a5cd1a871efa6 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 10:53:45 -0500 Subject: [PATCH 47/52] chore: remove tojson --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb0dbee2..518eee63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: get-jit-plugins: runs-on: ubuntu-latest outputs: - jit: ${{ toJSON(steps.plugins.outputs.jit) }} + jit: ${{ steps.plugins.outputs.jit }} steps: - uses: actions/checkout@v3 # - id: comm From c36a26a457083271242ccad09d9ab203102e1c5c Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 11:20:15 -0500 Subject: [PATCH 48/52] chore: move jit tests to own workflow --- .github/workflows/jit-install-smoke.yml | 67 ++++++++++++++++++++ .github/workflows/test.yml | 84 +------------------------ 2 files changed, 70 insertions(+), 81 deletions(-) create mode 100644 .github/workflows/jit-install-smoke.yml diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml new file mode 100644 index 00000000..08220e60 --- /dev/null +++ b/.github/workflows/jit-install-smoke.yml @@ -0,0 +1,67 @@ +name: jit-install-smoke + +on: + workflow_dispatch: + workflow_call: + +jobs: + 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 + + get-jit-plugins: + runs-on: ubuntu-latest + outputs: + jit: ${{ steps.plugins.outputs.jit }} + steps: + - uses: actions/checkout@v3 + - name: Get JIT plugins + id: plugins + # This was a pain to get working, be weary of changing it... + # For the dynamic matrix to work, you have to have a VERY specific format: + # Output must be multiline (no jq -c), quotes matter, cannot use toJSON on output, etc... + # The dynamic matrix needs to use fromJSON when reading the needs output + # Multiline format: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#example-of-a-multiline-string + run: | + { + echo 'jit<> "$GITHUB_OUTPUT" + + jit-install: + needs: [manifest, get-jit-plugins] + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} + runs-on: ${{matrix.os}} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: lts/* + cache: yarn + - run: yarn install + - run: yarn build + - uses: actions/download-artifact@v2 + with: + name: manifest + - name: Install JIT plugin + uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd + with: + max_attempts: 3 + retry_wait_seconds: 60 + command: yarn sf-release cli:install:jit:test --jit-plugin ${{matrix.jitPlugins}} + timeout_minutes: 60 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 518eee63..bbd52857 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,87 +20,9 @@ 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 - - get-jit-plugins: - runs-on: ubuntu-latest - outputs: - jit: ${{ steps.plugins.outputs.jit }} - steps: - - uses: actions/checkout@v3 - # - id: comm - # run: echo "jit=@salesforce/plugin-community" >> $GITHUB_OUTPUT - # - id: env - # run: echo "jit=@salesforce/plugin-env" >> $GITHUB_OUTPUT - - name: Get JIT plugins - id: plugins - run: | - { - echo 'jit<> "$GITHUB_OUTPUT" - - # get-jit-plugins-json: - # runs-on: ubuntu-latest - # needs: get-jit-plugins - # outputs: - # jitJson: ${{ steps.jitJson.outputs.jitJson }} - # steps: - # - name: Get JIT plugins JSON - # id: jitJson - # run: | - # JSON='${{ toJSON(needs.get-jit-plugins.outputs.jit) }}' - # echo "JIT JSON:" - # echo "$JSON" - # echo "jitJson=$JSON" >> "$GITHUB_OUTPUT" - - echo-jit-plugins: - needs: get-jit-plugins - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - # - run: | - # echo "JIT:" - # echo ${{ needs.get-jit-plugins.outputs.jit }} - - run: | - echo "JIT to JSON:" - echo ${{ toJSON(needs.get-jit-plugins.outputs.jit) }} - - run: | - echo "JIT from JSON:" - echo ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} - - jit-install: - needs: [manifest, get-jit-plugins] - strategy: - matrix: - jitPlugins: ${{ fromJSON(needs.get-jit-plugins.outputs.jit) }} - os: [ubuntu-latest, windows-latest] - runs-on: ${{matrix.os}} - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - cache: yarn - - run: yarn install - - run: yarn build - - uses: actions/download-artifact@v2 - with: - name: manifest - - run: yarn sf-release cli:install:jit:test --jit-plugin ${{matrix.jitPlugins}} + jit-install-smoke: + uses: ./.github/workflows/jit-install-smoke.yml + secrets: inherit artifacts: runs-on: ubuntu-latest From 93dfb9a3221583281242eb05c1ed65cf900e7b15 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 13:26:26 -0500 Subject: [PATCH 49/52] chore: testing removing yarn cache --- .github/workflows/jit-install-smoke.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml index 08220e60..3a14d28c 100644 --- a/.github/workflows/jit-install-smoke.yml +++ b/.github/workflows/jit-install-smoke.yml @@ -52,7 +52,6 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - cache: yarn - run: yarn install - run: yarn build - uses: actions/download-artifact@v2 From 45d32497c83617ccba0c456d50099b437b259ca7 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 13:52:23 -0500 Subject: [PATCH 50/52] chore: add install retries --- .github/workflows/jit-install-smoke.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml index 3a14d28c..e11d1808 100644 --- a/.github/workflows/jit-install-smoke.yml +++ b/.github/workflows/jit-install-smoke.yml @@ -52,7 +52,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: lts/* - - run: yarn install + - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main + with: + ignore-scripts: true - run: yarn build - uses: actions/download-artifact@v2 with: From f1b2a910b1ebc48305717e151d1fc297d1d8b44c Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 25 Sep 2023 14:06:04 -0500 Subject: [PATCH 51/52] chore: upload/download v3 --- .github/workflows/jit-install-smoke.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml index e11d1808..5086fa75 100644 --- a/.github/workflows/jit-install-smoke.yml +++ b/.github/workflows/jit-install-smoke.yml @@ -15,7 +15,7 @@ jobs: - run: yarn install - run: yarn build - run: yarn oclif manifest - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: manifest path: oclif.manifest.json @@ -56,7 +56,7 @@ jobs: with: ignore-scripts: true - run: yarn build - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: manifest - name: Install JIT plugin From 52d1d479a91aa308634757da5c164986be4ea2bb Mon Sep 17 00:00:00 2001 From: Willhoit Date: Tue, 26 Sep 2023 09:53:18 -0500 Subject: [PATCH 52/52] chore: bump rel-man --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d9ecf88..c0590256 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,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.3.1-dev.0", + "@salesforce/plugin-release-management": "^4.4.0", "@salesforce/prettier-config": "^0.0.3", "@salesforce/ts-sinon": "^1.4.15", "@types/debug": "^4.1.8",