Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: build

on: [push, pull_request]
on:
push:
branches: [main]
pull_request:

jobs:
lint:
Expand All @@ -13,7 +16,10 @@ jobs:
- name: Set up Node 22
uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Set up Yarn
run: corepack enable && corepack prepare yarn@4.10.3 --activate

- name: Cache Node modules
id: cache-node-modules
Expand All @@ -33,7 +39,7 @@ jobs:
run: yarn lint

- name: Install depcheck
run: yarn global add depcheck
run: npm install -g depcheck

- name: Run depcheck
run: depcheck --ignores="@types/jest,serverless-step-functions"
Expand All @@ -43,7 +49,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
node-version: [20, 22]
node-version: [20, 22, 24]

steps:
- name: Checkout
Expand All @@ -54,6 +60,9 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Set up Yarn
run: corepack enable && corepack prepare yarn@4.10.3 --activate

- name: Cache Node modules
id: cache-node-modules
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: integration-tests

on: [push, pull_request]
on:
push:
branches: [main]
pull_request:

jobs:
integration-tests:
Expand All @@ -10,10 +13,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Node 20
- name: Set up Node 24
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24

- name: Set up Yarn
run: corepack enable && corepack prepare yarn@4.10.3 --activate

- name: Cache Node modules
id: cache-node-modules
Expand All @@ -23,7 +29,7 @@ jobs:
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Install Serverless Framework
run: sudo yarn global add serverless@3.39 --prefix /usr/local
run: npm install -g serverless@3.39

- name: Run snapshot tests
env:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/monitor_api_integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Node 18
- name: Set up Node 24
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 24

- name: Set up Yarn
run: corepack enable && corepack prepare yarn@4.10.3 --activate

- name: Cache Node modules
id: cache-node-modules
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ on:
types: [created]
workflow_dispatch:

permissions:
id-token: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
with:
node-version: "22.x"
node-version: "24.x"
registry-url: "https://registry.npmjs.org"
- run: corepack enable && corepack prepare yarn@4.10.3 --activate
- run: yarn
- run: yarn build
- run: yarn publish
Expand Down
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ package-lock.json
test_forwarder_snapshot.json
test_extension_snapshot.json
test_extension_apigateway.json
.node-version
.node-version
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We love pull requests. Here's a quick guide.
yarn install
```
1. Make your changes.
1. Test your changes against your own testing application with the help of [`yarn link`](https://classic.yarnpkg.com/en/docs/cli/link/):
1. Test your changes against your own testing application with the help of [`yarn link`](https://yarnpkg.com/cli/link):
```bash
# From the root of the serverless-plugin-datadog repo
yarn build
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@
"peerDependencies": {
"serverless": "4.x || 3.x || 2.x || 1.x"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
"packageManager": "yarn@4.10.3"
}
Loading