Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/packages/opentelemet…
Browse files Browse the repository at this point in the history
…ry-node/aws-sdk-d5e2334280
  • Loading branch information
trentm authored Jan 14, 2025
2 parents 23cd64e + 72e5495 commit e3ecc10
Show file tree
Hide file tree
Showing 14 changed files with 928 additions and 3,872 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/slack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ jobs:
# Skip notification if:
# - dependabot or renovate PRs, too noisy
# - draft PRs
if: ${{ !(github.event.action == 'opened' && github.event.pull_request.draft) ||
github.event.pull_request.user.login != 'dependabot[bot]' ||
github.event.pull_request.user.login != 'elastic-renovate-prod[bot]' }}
if: ${{ !(
(github.event.action == 'opened' && github.event.pull_request.draft) ||
github.event.pull_request.user.login == 'dependabot[bot]' ||
github.event.pull_request.user.login == 'elastic-renovate-prod[bot]'
) }}
runs-on: ubuntu-24.04
steps:
- name: Prepare Slack message
Expand Down Expand Up @@ -117,7 +119,6 @@ jobs:
f.write("payload={}".format(json.dumps(payload)))
- name: Post Slack message
if: ${{ steps.prepare.outputs.payload }}
uses: slackapi/[email protected]
with:
method: chat.postMessage
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"compile-all": "./scripts/oneach.sh npm run --if-present compile",
"clean": "rm -rf node_modules build",
"oneach": "./scripts/oneach.sh",
"lint": "npm run lint:eslint && ls -d packages/* | while read d; do (cd $d; npm run lint); done",
"lint": "npm run lint:eslint && (set -e; ls -d packages/* | while read d; do (cd $d; npm run lint); done)",
"lint:eslint": "eslint --ext=js,mjs,cjs scripts examples # requires node >=16.0.0",
"lint:fix": "eslint --ext=js,mjs,cjs .eslintrc.js scripts examples --fix && ls -d packages/* | while read d; do (cd $d; npm run lint:fix); done"
},
"devDependencies": {
"@types/node": "^22.10.5",
"@types/node": "^22.10.6",
"dependency-check": "^4.1.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand Down
Loading

0 comments on commit e3ecc10

Please sign in to comment.