From 8ce99c1e8d9e0e662a4430610d5fb7eb1ef71a50 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Mon, 2 Oct 2023 21:45:24 -0400 Subject: [PATCH 1/4] Fix push on failure --- .github/workflows/cdkactions_validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml index 73834d77..e2ab7de0 100644 --- a/.github/workflows/cdkactions_validate.yaml +++ b/.github/workflows/cdkactions_validate.yaml @@ -18,7 +18,7 @@ jobs: git --no-pager diff ../workflows git diff-index --quiet HEAD -- ../workflows - name: Push updated manifests - if: "false" + if: failure() run: |- cd .github/workflows git config user.name github-actions From 4fa6a928e2e9b8f09366a6d1a93bfa8bd6fc0b2a Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Mon, 2 Oct 2023 22:53:27 -0400 Subject: [PATCH 2/4] Update Kraken 0.8.11 --- .github/cdk/package.json | 2 +- .github/cdk/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/cdk/package.json b/.github/cdk/package.json index edbc0463..de753083 100644 --- a/.github/cdk/package.json +++ b/.github/cdk/package.json @@ -13,7 +13,7 @@ "upgrade-cdk": "yarn upgrade cdkactions@latest cdkactions-cli@latest" }, "dependencies": { - "@pennlabs/kraken": "^0.8.6", + "@pennlabs/kraken": "^0.8.11", "cdkactions": "^0.2.3", "constructs": "^3.2.109" }, diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock index 232a9348..c1b07ea8 100644 --- a/.github/cdk/yarn.lock +++ b/.github/cdk/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@pennlabs/kraken@^0.8.6": - version "0.8.6" - resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.8.6.tgz#79a9d10bed36b699c526556cd69b6d81341847d1" - integrity sha512-aBblQa/661DJ2GP3Dq1KEzCZ72ZV/Jw7z4HNZoWPxGWn+tSPwvaPkSNDpK7tT+nJmu427giGU8DLyciU79hKbA== +"@pennlabs/kraken@^0.8.11": + version "0.8.11" + resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.8.11.tgz#8a1277b62be1b40aafb781b7b2e24cafbb0ff503" + integrity sha512-FA3dg2Id9bnnJ+Or+WkTxK3Xer4WBCvnmuXuNQSuZBDwRF8cRWhnA7Aempe3vr71a1HqiRoA6+bkNFHaKL/A7A== dependencies: cdkactions "^0.2.3" constructs "^3.2.80" From d297756ed366907aae673ac4c624d44ded8b175d Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Mon, 2 Oct 2023 22:55:18 -0400 Subject: [PATCH 3/4] Undo manifest failure check --- .github/workflows/cdkactions_validate.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml index e2ab7de0..89ae58d5 100644 --- a/.github/workflows/cdkactions_validate.yaml +++ b/.github/workflows/cdkactions_validate.yaml @@ -17,12 +17,12 @@ jobs: yarn build git --no-pager diff ../workflows git diff-index --quiet HEAD -- ../workflows - - name: Push updated manifests - if: failure() - run: |- - cd .github/workflows - git config user.name github-actions - git config user.email github-actions[bot]@users.noreply.github.com - git add . - git commit -m "Update cdkactions manifests" || exit 0 - git push + # - name: Push updated manifests + # if: failure() + # run: |- + # cd .github/workflows + # git config user.name github-actions + # git config user.email github-actions[bot]@users.noreply.github.com + # git add . + # git commit -m "Update cdkactions manifests" || exit 0 + # git push From 301804814d657372b5637694b8d89891a0fb634d Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Mon, 2 Oct 2023 22:56:17 -0400 Subject: [PATCH 4/4] Switch to false --- .github/workflows/cdkactions_validate.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml index 89ae58d5..73834d77 100644 --- a/.github/workflows/cdkactions_validate.yaml +++ b/.github/workflows/cdkactions_validate.yaml @@ -17,12 +17,12 @@ jobs: yarn build git --no-pager diff ../workflows git diff-index --quiet HEAD -- ../workflows - # - name: Push updated manifests - # if: failure() - # run: |- - # cd .github/workflows - # git config user.name github-actions - # git config user.email github-actions[bot]@users.noreply.github.com - # git add . - # git commit -m "Update cdkactions manifests" || exit 0 - # git push + - name: Push updated manifests + if: "false" + run: |- + cd .github/workflows + git config user.name github-actions + git config user.email github-actions[bot]@users.noreply.github.com + git add . + git commit -m "Update cdkactions manifests" || exit 0 + git push