From 6ce3acbc2270b5cf813bf0a5d45c2fac60e93895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Aug 2025 22:14:40 +0000 Subject: [PATCH 1/5] build(deps): bump the github-actions group across 1 directory with 2 updates Bumps the github-actions group with 2 updates in the / directory: [docker/login-action](https://github.com/docker/login-action) and [actions/download-artifact](https://github.com/actions/download-artifact). Updates `docker/login-action` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/74a5d142397b4f367a81961eba4e8cd7edddf772...184bdaa0721073962dff0199f1fb9940f07167d1) Updates `actions/download-artifact` from 4 to 5 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: actions/download-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/build-images.yml | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/test.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 44dcb39be..c359d4e39 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - name: Login to ghcr.io - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ea9f0a7f..9eb0358a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v5 with: name: packages path: dist @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v5 with: name: build-distribution path: ./build @@ -122,13 +122,13 @@ jobs: uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 - name: Log in to the Elastic Container registry - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }} username: ${{ secrets.ELASTIC_DOCKER_USERNAME }} password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }} - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v5 with: name: build-distribution path: ./build @@ -173,7 +173,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v5 with: name: arn-file - name: Create GitHub Draft Release diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e68d173b..61a8e787e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -193,7 +193,7 @@ jobs: - run: python -Im pip install --upgrade coverage[toml] - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v5 with: pattern: coverage-reports-* merge-multiple: true diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index a1109f743..1b5a66d0c 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -29,7 +29,7 @@ jobs: "pull_requests": "write" } - - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: registry: ghcr.io username: ${{ github.actor }} From 2fae44d1fdafb95033874342a1e49548124ffed4 Mon Sep 17 00:00:00 2001 From: "fr4nc1sc0.r4m0n" Date: Mon, 11 Aug 2025 13:21:34 +0200 Subject: [PATCH 2/5] Upgrade MongoDB version from 4.0 to 4.2 for pymongo-newest environment --- tests/docker-compose.yml | 4 ++-- tests/scripts/envs/pymongo-newest.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index b65a97e9e..e526f9339 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -46,8 +46,8 @@ services: volumes: - pymongodata36:/data/db - mongodb40: - image: mongo:4.0 + mongodb42: + image: mongo:4.2 ports: - "27017:27017" volumes: diff --git a/tests/scripts/envs/pymongo-newest.sh b/tests/scripts/envs/pymongo-newest.sh index d1766b69f..8b496971b 100644 --- a/tests/scripts/envs/pymongo-newest.sh +++ b/tests/scripts/envs/pymongo-newest.sh @@ -1,3 +1,3 @@ export PYTEST_MARKER="-m mongodb" -export DOCKER_DEPS="mongodb40" -export MONGODB_HOST="mongodb40" +export DOCKER_DEPS="mongodb42" +export MONGODB_HOST="mongodb42" From a5253dc8a343a85004c7320bdb4c330b5191ec25 Mon Sep 17 00:00:00 2001 From: "fr4nc1sc0.r4m0n" Date: Mon, 11 Aug 2025 13:24:11 +0200 Subject: [PATCH 3/5] Set right pymongodata var for mongoDB 4.2 --- tests/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index e526f9339..8f57ef19a 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -205,7 +205,7 @@ volumes: driver: local pymongodata36: driver: local - pymongodata40: + pymongodata42: driver: local pyesdata7: driver: local From 798a129432bc364d84df28c33c73bd34ad0c896e Mon Sep 17 00:00:00 2001 From: "fr4nc1sc0.r4m0n" Date: Mon, 11 Aug 2025 13:26:01 +0200 Subject: [PATCH 4/5] Set right pymongodata var for mongoDB 4.2 --- tests/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 8f57ef19a..09010f1bf 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -51,7 +51,7 @@ services: ports: - "27017:27017" volumes: - - pymongodata40:/data/db + - pymongodata42:/data/db memcached: image: memcached From 58bed5e6214b3e9aa716fa6051c6c3894b332a9a Mon Sep 17 00:00:00 2001 From: "fr4nc1sc0.r4m0n" Date: Mon, 11 Aug 2025 13:30:25 +0200 Subject: [PATCH 5/5] Undo upgrade changes because are done here https://github.com/elastic/apm-agent-python/pull/2391 --- tests/docker-compose.yml | 8 ++++---- tests/scripts/envs/pymongo-newest.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 09010f1bf..b65a97e9e 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -46,12 +46,12 @@ services: volumes: - pymongodata36:/data/db - mongodb42: - image: mongo:4.2 + mongodb40: + image: mongo:4.0 ports: - "27017:27017" volumes: - - pymongodata42:/data/db + - pymongodata40:/data/db memcached: image: memcached @@ -205,7 +205,7 @@ volumes: driver: local pymongodata36: driver: local - pymongodata42: + pymongodata40: driver: local pyesdata7: driver: local diff --git a/tests/scripts/envs/pymongo-newest.sh b/tests/scripts/envs/pymongo-newest.sh index 8b496971b..d1766b69f 100644 --- a/tests/scripts/envs/pymongo-newest.sh +++ b/tests/scripts/envs/pymongo-newest.sh @@ -1,3 +1,3 @@ export PYTEST_MARKER="-m mongodb" -export DOCKER_DEPS="mongodb42" -export MONGODB_HOST="mongodb42" +export DOCKER_DEPS="mongodb40" +export MONGODB_HOST="mongodb40"