Skip to content

Commit 4d8f672

Browse files
committed
CCM-12896: Use NPM to generate dependencies, instead of Makefile
1 parent 38fd969 commit 4d8f672

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.github/workflows/stage-2-test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
npm ci
5858
- name: "Generate dependencies"
5959
run: |
60-
make generate
60+
npm run generate-dependencies
6161
git diff --exit-code
6262
test-unit:
6363
name: "Unit tests"
@@ -71,7 +71,7 @@ jobs:
7171
npm ci
7272
- name: "Generate dependencies"
7373
run: |
74-
make generate
74+
npm run generate-dependencies
7575
- name: "Run unit test suite"
7676
run: |
7777
make test-unit
@@ -104,7 +104,7 @@ jobs:
104104
npm ci
105105
- name: "Generate dependencies"
106106
run: |
107-
make generate
107+
npm run generate-dependencies
108108
- name: "Run linting"
109109
run: |
110110
make test-lint
@@ -120,7 +120,7 @@ jobs:
120120
npm ci
121121
- name: "Generate dependencies"
122122
run: |
123-
make generate
123+
npm run generate-dependencies
124124
- name: "Run typecheck"
125125
run: |
126126
make test-typecheck

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ include scripts/init.mk
99

1010
quick-start: config clean build serve-docs # Quick start target to setup, build and serve docs @Pipeline
1111

12+
dependencies: # Install dependencies needed to build and test the project @Pipeline
13+
# TODO: Implement installation of your project dependencies
14+
1215
generate: # Generate any autogenerated output @Pipeline
13-
$(MAKE) -C src/cloudevents/domains/digital-letters build-no-bundle publish-bundled-json
1416
npm run generate-dependencies
1517

1618
build: # Build the project artefact @Pipeline
1719
$(MAKE) -C docs build
18-
npm run generate-dependencies
1920

2021
debug:
2122
$(MAKE) -C docs debug

infrastructure/terraform/components/dl/pre.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
# It ensures all Node.js dependencies are installed, generates any required dependencies,
55
# and builds all Lambda functions in the workspace before Terraform provisions infrastructure.
66

7-
echo "Running pre-terraform script..."
8-
echo "Current directory: $(pwd)"
9-
echo "Listing files in current directory:"
10-
ls -la
11-
127
npm ci
138

149
npm run generate-dependencies

0 commit comments

Comments
 (0)