Merge pull request #364 from pwrdrvr/fix-cdk-version

Fix cdk version
pwrdrvr · Apr 25, 2024 · dc7afc9 · dc7afc9
2 parents 5bd0540 + 9c964ab
commit dc7afc9
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,16 @@ env:
   AWS_REGION: us-east-2
 
 jobs:
+  install-deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/configure-nodejs
+        with:
+          lookup-only: 'true' # We only want to lookup from the cache - if a hit, this job does nothing
+
   build:
+    needs: [install-deps]
     runs-on: ubuntu-latest
     outputs:
       prSuffix: ${{ steps.prSuffix.outputs.prSuffix }}
@@ -577,7 +586,8 @@ jobs:
           npm run test:integration
 
   build-jsii:
-    if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && contains( github.event.pull_request.labels.*.name, 'BUILD-JSII')) || (github.event_name == 'pull_request' && github.actor == 'dependabot[bot]')
+    # if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && contains( github.event.pull_request.labels.*.name, 'BUILD-JSII')) || (github.event_name == 'pull_request' && github.actor == 'dependabot[bot]')
+    needs: [install-deps]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -16,8 +16,17 @@ on:
   #     - main
 
 jobs:
+  install-deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/configure-nodejs
+        with:
+          lookup-only: 'true' # We only want to lookup from the cache - if a hit, this job does nothing
+
   build:
     name: Build CDK Construct
+    needs: [install-deps]
     runs-on: ubuntu-latest
     permissions:
       contents: write

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,11 +8,20 @@ on:
   release:
     types: [published]
 jobs:
+  install-deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/configure-nodejs
+        with:
+          lookup-only: 'true' # We only want to lookup from the cache - if a hit, this job does nothing
+
   #
   # CDK Construct
   #
   release:
     name: Build CDK Construct
+    needs: [install-deps]
     runs-on: ubuntu-latest
     permissions:
       contents: write

diff --git a/packages/microapps-cdk/.projen/deps.json b/packages/microapps-cdk/.projen/deps.json
diff --git a/packages/microapps-cdk/.projen/tasks.json b/packages/microapps-cdk/.projen/tasks.json
diff --git a/packages/microapps-cdk/.projenrc.js b/packages/microapps-cdk/.projenrc.js
@@ -7,7 +7,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
   description:
     'MicroApps framework, by PwrDrvr LLC, delivered as an AWS CDK construct that provides the DynamoDB, Router service, Deploy service, API Gateway, and CloudFront distribution.',
   cdkVersion: '2.95.0',
-  cdkVersionPinning: true,
+  cdkVersionPinning: false,
   copyrightOwner: 'PwrDrvr LLC',
   copyrightPeriod: '2020',
   defaultReleaseBranch: 'main',

diff --git a/packages/microapps-cdk/package.json b/packages/microapps-cdk/package.json