From dfd6ee22c1995b995e18c23fc99a4a76466fa20d Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Tue, 10 Dec 2024 11:52:45 -0800 Subject: [PATCH 1/7] Bump download-artifact --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- .projenrc.js | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15130c9..b25a58f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Download patch - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: .repo.patch path: ${{ runner.temp }} @@ -93,7 +93,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: build-artifact path: dist @@ -121,7 +121,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: build-artifact path: dist diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e17e382..12ea7fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: build-artifact path: dist @@ -86,7 +86,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: build-artifact path: dist @@ -122,7 +122,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: build-artifact path: dist diff --git a/.projenrc.js b/.projenrc.js index b297fd9..2d30629 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -63,4 +63,6 @@ project.addTask('test:synth', { exec: 'npx cdk synth -a "npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.karpenter.ts"', }); +project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.1.7'); + project.synth(); From 5d472f4d15c895c7a5d2daa94ef8892a50d0c34b Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Tue, 10 Dec 2024 12:21:45 -0800 Subject: [PATCH 2/7] Bump upload/download artifact to latest version --- .github/workflows/build.yml | 10 +++++----- .github/workflows/release.yml | 8 ++++---- .projenrc.js | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b25a58f..a10e03d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.4.3 with: name: .repo.patch path: .repo.patch @@ -48,7 +48,7 @@ jobs: run: cd dist && getfacl -R . > permissions-backup.acl continue-on-error: true - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.4.3 with: name: build-artifact path: dist @@ -66,7 +66,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Download patch - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: .repo.patch path: ${{ runner.temp }} @@ -93,7 +93,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: build-artifact path: dist @@ -121,7 +121,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: build-artifact path: dist diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12ea7fa..fa95edf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: continue-on-error: true - name: Upload artifact if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.4.3 with: name: build-artifact path: dist @@ -57,7 +57,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: build-artifact path: dist @@ -86,7 +86,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: build-artifact path: dist @@ -122,7 +122,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.4.3 with: name: build-artifact path: dist diff --git a/.projenrc.js b/.projenrc.js index 2d30629..a36df51 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -63,6 +63,7 @@ project.addTask('test:synth', { exec: 'npx cdk synth -a "npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.karpenter.ts"', }); -project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.1.7'); +project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.4.3'); +project.github.actions.set('actions/upload-artifact', 'actions/upload-artifact@v4.4.3'); project.synth(); From 3743ce4e8d77ccfd708a9cf1202e768805d7f2df Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Tue, 10 Dec 2024 12:28:37 -0800 Subject: [PATCH 3/7] Use version that exists --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- .projenrc.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a10e03d..28eae84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Download patch - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: .repo.patch path: ${{ runner.temp }} @@ -93,7 +93,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: build-artifact path: dist @@ -121,7 +121,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: build-artifact path: dist diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa95edf..8f8d575 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: build-artifact path: dist @@ -86,7 +86,7 @@ jobs: with: node-version: 18.x - name: Download build artifacts - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: build-artifact path: dist @@ -122,7 +122,7 @@ jobs: with: python-version: 3.x - name: Download build artifacts - uses: actions/download-artifact@v4.4.3 + uses: actions/download-artifact@v4.1.8 with: name: build-artifact path: dist diff --git a/.projenrc.js b/.projenrc.js index a36df51..b16b3d7 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -63,7 +63,7 @@ project.addTask('test:synth', { exec: 'npx cdk synth -a "npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.karpenter.ts"', }); -project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.4.3'); +project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.1.8'); project.github.actions.set('actions/upload-artifact', 'actions/upload-artifact@v4.4.3'); project.synth(); From 55e39ad1eaa32c965fd986497e1dec6b30378d51 Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Tue, 10 Dec 2024 14:14:57 -0800 Subject: [PATCH 4/7] Try include-hidden-files: true --- .github/workflows/build.yml | 2 ++ .github/workflows/release.yml | 1 + .projenrc.js | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28eae84..022ecbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,7 @@ jobs: with: name: .repo.patch path: .repo.patch + include-hidden-files: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -52,6 +53,7 @@ jobs: with: name: build-artifact path: dist + include-hidden-files: true self-mutation: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f8d575..cf426fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,6 +45,7 @@ jobs: with: name: build-artifact path: dist + include-hidden-files: true release_github: name: Publish to GitHub Releases needs: release diff --git a/.projenrc.js b/.projenrc.js index b16b3d7..5db4bc7 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -1,4 +1,4 @@ -const { awscdk } = require('projen'); +const { awscdk, JsonPatch } = require('projen'); const { DependabotScheduleInterval } = require('projen/lib/github'); const PROJECT_NAME = 'cdk-eks-karpenter'; @@ -66,4 +66,12 @@ project.addTask('test:synth', { project.github.actions.set('actions/download-artifact', 'actions/download-artifact@v4.1.8'); project.github.actions.set('actions/upload-artifact', 'actions/upload-artifact@v4.4.3'); +// https://github.com/actions/upload-artifact/issues/602 +build_workflow = project.tryFindObjectFile('.github/workflows/build.yml'); +build_workflow.patch(JsonPatch.add('/jobs/build/steps/5/with/include-hidden-files', true)) +build_workflow.patch(JsonPatch.add('/jobs/build/steps/8/with/include-hidden-files', true)) + +build_workflow = project.tryFindObjectFile('.github/workflows/release.yml'); +build_workflow.patch(JsonPatch.add('/jobs/release/steps/7/with/include-hidden-files', true)) + project.synth(); From 8de483eb760321a02d6e08b694ae1d34191bf84c Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Tue, 10 Dec 2024 15:31:21 -0800 Subject: [PATCH 5/7] Update variable name --- .projenrc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.projenrc.js b/.projenrc.js index 5db4bc7..ea58564 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -71,7 +71,7 @@ build_workflow = project.tryFindObjectFile('.github/workflows/build.yml'); build_workflow.patch(JsonPatch.add('/jobs/build/steps/5/with/include-hidden-files', true)) build_workflow.patch(JsonPatch.add('/jobs/build/steps/8/with/include-hidden-files', true)) -build_workflow = project.tryFindObjectFile('.github/workflows/release.yml'); -build_workflow.patch(JsonPatch.add('/jobs/release/steps/7/with/include-hidden-files', true)) +release_workflow = project.tryFindObjectFile('.github/workflows/release.yml'); +release_workflow.patch(JsonPatch.add('/jobs/release/steps/7/with/include-hidden-files', true)) project.synth(); From 653179950c86f7045a9ebccabc9a03ecaf76a380 Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Wed, 11 Dec 2024 10:35:22 -0800 Subject: [PATCH 6/7] Run build --- .projenrc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.projenrc.js b/.projenrc.js index ea58564..4c913de 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -68,10 +68,10 @@ project.github.actions.set('actions/upload-artifact', 'actions/upload-artifact@v // https://github.com/actions/upload-artifact/issues/602 build_workflow = project.tryFindObjectFile('.github/workflows/build.yml'); -build_workflow.patch(JsonPatch.add('/jobs/build/steps/5/with/include-hidden-files', true)) -build_workflow.patch(JsonPatch.add('/jobs/build/steps/8/with/include-hidden-files', true)) +build_workflow.patch(JsonPatch.add('/jobs/build/steps/5/with/include-hidden-files', true)); +build_workflow.patch(JsonPatch.add('/jobs/build/steps/8/with/include-hidden-files', true)); release_workflow = project.tryFindObjectFile('.github/workflows/release.yml'); -release_workflow.patch(JsonPatch.add('/jobs/release/steps/7/with/include-hidden-files', true)) +release_workflow.patch(JsonPatch.add('/jobs/release/steps/7/with/include-hidden-files', true)); project.synth(); From 5c8758ef534b10039bc20dec085c20efebd2a342 Mon Sep 17 00:00:00 2001 From: Keenan Graham Date: Wed, 11 Dec 2024 13:50:43 -0800 Subject: [PATCH 7/7] Empty commit