From 0f164089f427f022baa5bb0a8de16655741e6ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2026 03:06:51 +0000 Subject: [PATCH 1/2] chore(deps): bump the actions group with 3 updates Bumps the actions group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) and [docker/build-push-action](https://github.com/docker/build-push-action). Updates `actions/checkout` from 6.0.1 to 7.0.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6.0.1...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0) Updates `docker/setup-buildx-action` from 3 to 4 - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3...v4) Updates `docker/build-push-action` from 6.18.0 to 7.3.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.18.0...53b7df96c91f9c12dcc8a07bcb9ccacbed38856a) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: docker/build-push-action dependency-version: 7.3.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/build-deploy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 66d9f8f..afee92b 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -71,7 +71,7 @@ jobs: run: cp dev.env .env - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 # Pre-build every service image the dev stack builds, with GHA layer # caching, so their apt/pip/node install layers survive across runs @@ -82,7 +82,7 @@ jobs: # one at a time. - parallel: - name: Build ckan dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./ckan file: ./ckan/Dockerfile @@ -92,7 +92,7 @@ jobs: tags: ghcr.io/fjelltopp/adx_develop/ckan_base:development - name: Build db dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./db file: ./db/Dockerfile @@ -105,7 +105,7 @@ jobs: tags: adr.db:development - name: Build solr dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./solr file: ./solr/Dockerfile @@ -115,7 +115,7 @@ jobs: tags: adr.solr:development - name: Build cron dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./cron load: true @@ -124,7 +124,7 @@ jobs: tags: adr.cron:development - name: Build datapusher dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./submodules/datapusher load: true @@ -133,7 +133,7 @@ jobs: tags: adr.datapusher:development - name: Build giftless dev image (cached) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: ./submodules/giftless/ file: ./submodules/giftless/Dockerfile @@ -234,7 +234,7 @@ jobs: type=sha,prefix=sha-,format=short - name: Build (no push) - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 with: context: . file: deploy/Dockerfile.prod @@ -257,12 +257,12 @@ jobs: && needs.build.result == 'success' runs-on: ubuntu-latest steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: submodules: recursive - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to ACR uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0 From ce21b58e0adbb3c5873c7dae5b9129ad22d3bcb8 Mon Sep 17 00:00:00 2001 From: Craig Cooper Date: Mon, 27 Jul 2026 14:06:17 +0700 Subject: [PATCH 2/2] update --- .github/workflows/build-deploy.yml | 18 +++++++++--------- submodules/ckanext-unaids | 2 +- submodules/ckanext-ytp-request | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index afee92b..d459129 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -71,7 +71,7 @@ jobs: run: cp dev.env .env - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 # Pre-build every service image the dev stack builds, with GHA layer # caching, so their apt/pip/node install layers survive across runs @@ -82,7 +82,7 @@ jobs: # one at a time. - parallel: - name: Build ckan dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./ckan file: ./ckan/Dockerfile @@ -92,7 +92,7 @@ jobs: tags: ghcr.io/fjelltopp/adx_develop/ckan_base:development - name: Build db dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./db file: ./db/Dockerfile @@ -105,7 +105,7 @@ jobs: tags: adr.db:development - name: Build solr dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./solr file: ./solr/Dockerfile @@ -115,7 +115,7 @@ jobs: tags: adr.solr:development - name: Build cron dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./cron load: true @@ -124,7 +124,7 @@ jobs: tags: adr.cron:development - name: Build datapusher dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./submodules/datapusher load: true @@ -133,7 +133,7 @@ jobs: tags: adr.datapusher:development - name: Build giftless dev image (cached) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: ./submodules/giftless/ file: ./submodules/giftless/Dockerfile @@ -234,7 +234,7 @@ jobs: type=sha,prefix=sha-,format=short - name: Build (no push) - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v6.10.0 + uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 with: context: . file: deploy/Dockerfile.prod @@ -262,7 +262,7 @@ jobs: submodules: recursive - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 - name: Login to ACR uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0 diff --git a/submodules/ckanext-unaids b/submodules/ckanext-unaids index 9d47c21..9bf4f30 160000 --- a/submodules/ckanext-unaids +++ b/submodules/ckanext-unaids @@ -1 +1 @@ -Subproject commit 9d47c215d055ef0ef0f05815f93e57d98185f653 +Subproject commit 9bf4f30017cf281d67023b605bae4bc226eb1483 diff --git a/submodules/ckanext-ytp-request b/submodules/ckanext-ytp-request index 32220ad..b97a2a3 160000 --- a/submodules/ckanext-ytp-request +++ b/submodules/ckanext-ytp-request @@ -1 +1 @@ -Subproject commit 32220ad82a5e3fa2089fd31f0f528fde72a45bff +Subproject commit b97a2a36ad98fddc05b111c2dd98b41f9c539035