From 5f04bfd43791a32ac236fe8531ab1f62d870fcff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 08:53:20 +0100 Subject: [PATCH] Bump axios from 1.6.0 to 1.7.4 in /backend-app (#184) * Bump axios from 1.6.0 to 1.7.4 in /backend-app Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.0...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update auto-merge-dependabot.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abdelouahab Bella --- .github/workflows/auto-merge-dependabot.yml | 12 +++++++----- backend-app/package-lock.json | 11 +++++------ backend-app/package.json | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 7315fcd..53e4b61 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -6,23 +6,25 @@ on: jobs: worker: runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' + steps: - name: Automerge - uses: actions/github-script@latest + uses: actions/github-script@v6 with: + github-token: ${{ secrets.GITHUB_TOKEN }} script: | console.log("Context: ", context); - await github.pulls.createReview({ + + await github.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number, event: 'APPROVE' }); - await github.pulls.merge({ + + await github.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number }); - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/backend-app/package-lock.json b/backend-app/package-lock.json index 9fc41e9..f9c740f 100644 --- a/backend-app/package-lock.json +++ b/backend-app/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "axios": "1.6.0", + "axios": "1.7.4", "bcrypt": "5.1.1", "chai": "4.3.10", "compression": "1.7.4", @@ -34,7 +34,6 @@ "mocha": "10.2.0", "mongoose": "7.5.0", "morgan": "1.10.0", - "nodemon": "3.0.2", "prettier": "3.0.3", "qs": "6.11.2", "supertest": "6.3.3", @@ -1900,11 +1899,11 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } diff --git a/backend-app/package.json b/backend-app/package.json index 1e2a91c..5a9da65 100644 --- a/backend-app/package.json +++ b/backend-app/package.json @@ -17,7 +17,7 @@ "author": "NFS-Team", "license": "ISC", "dependencies": { - "axios": "1.6.0", + "axios": "1.7.4", "bcrypt": "5.1.1", "chai": "4.3.10", "compression": "1.7.4",