Use projen tasks (#29)

* Use projen tasks Ensure that it always installs dependencies with the same strategy. Signed-off-by: David Calavera <[email protected]> * Update node version for releases. Signed-off-by: David Calavera <[email protected]> * Update dependencies. Signed-off-by: David Calavera <[email protected]> --------- Signed-off-by: David Calavera <[email protected]>
cargo-lambda · Nov 12, 2023 · f44cc1a · f44cc1a
1 parent 0a96e31
commit f44cc1a
Show file tree

Hide file tree

Showing 11 changed files with 697 additions and 874 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,8 +46,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-      - name: Install NPM dependencies
-        run: yarn install --check-files
+      - name: Install dependencies
+        run: npx projen install:ci
       - name: build
         run: npx projen build
       - name: Find mutations
@@ -124,7 +124,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create js artifact
         run: cd .repo && npx projen package:js
       - name: Collect js Artifact
@@ -153,7 +153,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create java artifact
         run: cd .repo && npx projen package:java
       - name: Collect java Artifact
@@ -181,7 +181,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create python artifact
         run: cd .repo && npx projen package:python
       - name: Collect python Artifact
@@ -209,7 +209,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create dotnet artifact
         run: cd .repo && npx projen package:dotnet
       - name: Collect dotnet Artifact
@@ -237,7 +237,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create go artifact
         run: cd .repo && npx projen package:go
       - name: Collect go Artifact

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
         with:
           python-version: '3.x'
       - name: Install NPM dependencies
-        run: yarn install --check-files --frozen-lockfile
+        run: npx projen install:ci
       - name: release
         run: npx projen release
       - name: Check for new commits
@@ -81,7 +81,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - name: Download build artifacts
         uses: actions/download-artifact@v3
         with:
@@ -106,7 +106,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - name: Download build artifacts
         uses: actions/download-artifact@v3
         with:
@@ -118,7 +118,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create js artifact
         run: cd .repo && npx projen package:js
       - name: Collect js Artifact
@@ -143,7 +143,7 @@ jobs:
           java-version: '17.x'
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - name: Download build artifacts
         uses: actions/download-artifact@v3
         with:
@@ -155,7 +155,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create java artifact
         run: cd .repo && npx projen package:java
       - name: Collect java Artifact
@@ -178,7 +178,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x
@@ -193,7 +193,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create python artifact
         run: cd .repo && npx projen package:python
       - name: Collect python Artifact
@@ -213,7 +213,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 3.x
@@ -228,7 +228,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create dotnet artifact
         run: cd .repo && npx projen package:dotnet
       - name: Collect dotnet Artifact
@@ -247,7 +247,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
       - uses: actions/setup-go@v3
         with:
           go-version: ^1.16.0
@@ -262,7 +262,7 @@ jobs:
       - name: Prepare Repository
         run: mv dist .repo
       - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
+        run: cd .repo && npx projen install:ci
       - name: Create go artifact
         run: cd .repo && npx projen package:go
       - name: Collect go Artifact

diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/.projenrc.js b/.projenrc.js
@@ -36,6 +36,13 @@ const project = new awscdk.AwsCdkConstructLibrary({
   },
 });
 
+project.addDevDeps('aws-cdk-lib@^2');
+project.addDevDeps('[email protected]');
+project.addDevDeps('[email protected]');
+project.addDevDeps('[email protected]');
+project.addDevDeps('@types/node@^18');
+project.addDevDeps('jest@^29');
+project.addDevDeps('ts-jest@^29');
 project.addBundledDeps('js-toml@^0.1.1');
 
 project.addGitIgnore('target');

diff --git a/API.md b/API.md
diff --git a/package.json b/package.json
diff --git a/test/bundlingOptions.test.ts b/test/bundlingOptions.test.ts
@@ -1,8 +1,8 @@
 import * as path from 'path';
 import { env } from 'process';
+import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
-import * as cdk from 'aws-cdk-lib/core';
 import { getManifestPath } from '../src/cargo';
 import { RustFunction, RustFunctionProps, cargoLambdaVersion } from '../src/index';
 import { bundlingOptionsFromRustFunctionProps } from '../src/util';
@@ -52,8 +52,8 @@ describe('bundlingOptionsFromRustFunctionProps', () => {
 const forcedDockerBundling = !!env.FORCE_DOCKER_RUN || !cargoLambdaVersion();
 
 const templateWithProps = (props?: RustFunctionProps) => {
-  const app = new cdk.App();
-  const stack = new cdk.Stack(app);
+  const app = new App();
+  const stack = new Stack(app);
   const testSource = getManifestPath(path.join(__dirname, 'fixtures/single-package/Cargo.toml'));
 
   new RustFunction(stack, 'arm-64-set-via-lambda-architecture', { manifestPath: testSource, ...props });

diff --git a/test/extension.test.ts b/test/extension.test.ts
@@ -1,14 +1,14 @@
 import { join } from 'path';
 import { env } from 'process';
-import * as cdk from 'aws-cdk-lib/core';
+import { App, Stack } from 'aws-cdk-lib';
 import { RustExtension, cargoLambdaVersion } from '../src/index';
 
 const forcedDockerBundling = !!env.FORCE_DOCKER_RUN || !cargoLambdaVersion();
 
 describe('CargoLambda.RustExtension', () => {
   describe('With single package Cargo project', () => {
-    const app = new cdk.App();
-    const stack = new cdk.Stack(app);
+    const app = new App();
+    const stack = new Stack(app);
     const testSource = join(__dirname, 'fixtures/single-package');
 
     new RustExtension(stack, 'rust extension', {
@@ -24,8 +24,8 @@ describe('CargoLambda.RustExtension', () => {
   });
 
   describe('With a Cargo workspace', () => {
-    const app = new cdk.App();
-    const stack = new cdk.Stack(app);
+    const app = new App();
+    const stack = new Stack(app);
     const testSource = join(__dirname, 'fixtures/cargo-workspace');
 
     new RustExtension(stack, 'rust extension 1', {