From ae54ab348acbe492c45ffff55f1dbd200ffe0c02 Mon Sep 17 00:00:00 2001 From: Mutahhir Hayat Date: Tue, 9 Jan 2024 18:25:47 +0100 Subject: [PATCH 1/2] fix: Use jq to ensure we read isDeprecated better, and defend deprecation filter more --- src/deprecate-packages.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/deprecate-packages.ts b/src/deprecate-packages.ts index 76517355..47a1c488 100644 --- a/src/deprecate-packages.ts +++ b/src/deprecate-packages.ts @@ -62,14 +62,14 @@ export class DeprecatePackages { name: "Check deprecation status", id: "check_status", run: [ - `IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"')`, + `IS_DEPRECATED=$(cat package.json | jq .cdktf.isDeprecated -r)`, `echo "is_deprecated=$IS_DEPRECATED"`, // for easier debugging `echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT`, ].join("\n"), }, { name: "Deprecate the package on NPM", - if: "steps.check_status.outputs.is_deprecated", + if: "steps.check_status.outputs.is_deprecated == 'true' || steps.check_status.outputs.is_deprecated == true", run: [ 'npm set "//$NPM_REGISTRY/:_authToken=$NPM_TOKEN"', `npm deprecate ${packageInfo.npm.name} "${deprecationMessageForNPM}"`, From 71cb1457841412bc42b9952260cd10b25375baf5 Mon Sep 17 00:00:00 2001 From: team-tf-cdk Date: Tue, 9 Jan 2024 17:29:31 +0000 Subject: [PATCH 2/2] chore: self mutation Signed-off-by: team-tf-cdk --- test/__snapshots__/index.test.ts.snap | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap index 861cbd25..888cf744 100644 --- a/test/__snapshots__/index.test.ts.snap +++ b/test/__snapshots__/index.test.ts.snap @@ -518,11 +518,11 @@ jobs: - name: Check deprecation status id: check_status run: |- - IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"') + IS_DEPRECATED=$(cat package.json | jq .cdktf.isDeprecated -r) echo "is_deprecated=$IS_DEPRECATED" echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT - name: Deprecate the package on NPM - if: steps.check_status.outputs.is_deprecated + if: steps.check_status.outputs.is_deprecated == 'true' || steps.check_status.outputs.is_deprecated == true env: NPM_REGISTRY: registry.npmjs.org NPM_TOKEN: \${{ secrets.NPM_TOKEN }} @@ -2802,11 +2802,11 @@ jobs: - name: Check deprecation status id: check_status run: |- - IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"') + IS_DEPRECATED=$(cat package.json | jq .cdktf.isDeprecated -r) echo "is_deprecated=$IS_DEPRECATED" echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT - name: Deprecate the package on NPM - if: steps.check_status.outputs.is_deprecated + if: steps.check_status.outputs.is_deprecated == 'true' || steps.check_status.outputs.is_deprecated == true env: NPM_REGISTRY: registry.npmjs.org NPM_TOKEN: \${{ secrets.NPM_TOKEN }} @@ -5530,11 +5530,11 @@ jobs: - name: Check deprecation status id: check_status run: |- - IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"') + IS_DEPRECATED=$(cat package.json | jq .cdktf.isDeprecated -r) echo "is_deprecated=$IS_DEPRECATED" echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT - name: Deprecate the package on NPM - if: steps.check_status.outputs.is_deprecated + if: steps.check_status.outputs.is_deprecated == 'true' || steps.check_status.outputs.is_deprecated == true env: NPM_REGISTRY: registry.npmjs.org NPM_TOKEN: \${{ secrets.NPM_TOKEN }} @@ -8243,11 +8243,11 @@ jobs: - name: Check deprecation status id: check_status run: |- - IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"') + IS_DEPRECATED=$(cat package.json | jq .cdktf.isDeprecated -r) echo "is_deprecated=$IS_DEPRECATED" echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT - name: Deprecate the package on NPM - if: steps.check_status.outputs.is_deprecated + if: steps.check_status.outputs.is_deprecated == 'true' || steps.check_status.outputs.is_deprecated == true env: NPM_REGISTRY: registry.npmjs.org NPM_TOKEN: \${{ secrets.NPM_TOKEN }}