From b6222c629dc208660f9db9e8a662406a7ea3fd3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:04:12 +0000 Subject: [PATCH 1/3] chore(deps): update github-actions --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/schedule.yaml | 2 +- .github/workflows/scorecard.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 51a37da..2873dd2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ permissions: read-all jobs: build: - uses: miracum/.github/.github/workflows/standard-build.yaml@db8574b42e0c528f9cddc1ce84a40a837283cee0 # v1.10.2 + uses: miracum/.github/.github/workflows/standard-build.yaml@028aedc2d5806bb362562560f5e871d9364902cd # v1.11.2 permissions: contents: read id-token: write @@ -36,7 +36,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} steps: - name: Download test image - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: ${{ needs.build.outputs.image-slug }}-test path: /tmp @@ -77,7 +77,7 @@ jobs: persist-credentials: false - name: Download build image - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 if: ${{ github.event_name == 'pull_request' }} with: name: ${{ needs.build.outputs.image-slug }} @@ -107,7 +107,7 @@ jobs: docker compose -p e2e -f deploy/docker-compose.yml -f deploy/docker-compose.gw-deps.yml -f tests/e2e/docker-compose.yml down --volumes --remove-orphans lint: - uses: miracum/.github/.github/workflows/standard-lint.yaml@db8574b42e0c528f9cddc1ce84a40a837283cee0 # v1.10.2 + uses: miracum/.github/.github/workflows/standard-lint.yaml@028aedc2d5806bb362562560f5e871d9364902cd # v1.11.2 permissions: contents: read pull-requests: write @@ -122,7 +122,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} release: - uses: miracum/.github/.github/workflows/standard-release.yaml@db8574b42e0c528f9cddc1ce84a40a837283cee0 # v1.10.2 + uses: miracum/.github/.github/workflows/standard-release.yaml@028aedc2d5806bb362562560f5e871d9364902cd # v1.11.2 needs: - build - test diff --git a/.github/workflows/schedule.yaml b/.github/workflows/schedule.yaml index 08ffe91..6b89ebe 100644 --- a/.github/workflows/schedule.yaml +++ b/.github/workflows/schedule.yaml @@ -10,7 +10,7 @@ permissions: read-all jobs: schedule: - uses: miracum/.github/.github/workflows/standard-schedule.yaml@db8574b42e0c528f9cddc1ce84a40a837283cee0 # v1.10.2 + uses: miracum/.github/.github/workflows/standard-schedule.yaml@028aedc2d5806bb362562560f5e871d9364902cd # v1.11.2 permissions: contents: read issues: write diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index ee45a3f..194c69a 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: SARIF file path: results.sarif From 5569debaae4fc29e332d2df306594821eaee4c70 Mon Sep 17 00:00:00 2001 From: chgl Date: Wed, 10 Jul 2024 13:09:36 +0200 Subject: [PATCH 2/3] multi-platform --- .github/workflows/ci.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2873dd2..a222796 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,6 +23,9 @@ jobs: with: enable-build-test-layer: true enable-upload-test-image: true + platforms: | + linux/amd64 + linux/arm64 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -35,6 +38,18 @@ jobs: pull-requests: write if: ${{ github.event_name == 'pull_request' }} steps: + # + # via + - name: Set up containerd image store + shell: bash + run: | + jq '. | .+{"features": {"containerd-snapshotter": true}}' /etc/docker/daemon.json > /tmp/docker-daemon-with-containerd.json + sudo mv /tmp/docker-daemon-with-containerd.json /etc/docker/daemon.json + cat /etc/docker/daemon.json + sudo systemctl restart docker + + docker info -f '{{ .DriverStatus }}' + - name: Download test image uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: @@ -71,6 +86,18 @@ jobs: needs: - build steps: + # + # via + - name: Set up containerd image store + shell: bash + run: | + jq '. | .+{"features": {"containerd-snapshotter": true}}' /etc/docker/daemon.json > /tmp/docker-daemon-with-containerd.json + sudo mv /tmp/docker-daemon-with-containerd.json /etc/docker/daemon.json + cat /etc/docker/daemon.json + sudo systemctl restart docker + + docker info -f '{{ .DriverStatus }}' + - name: "Checkout code" uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: From d57fd197a7576ae0c527f0230eef8089392d2fd3 Mon Sep 17 00:00:00 2001 From: chgl Date: Wed, 10 Jul 2024 13:15:55 +0200 Subject: [PATCH 3/3] dropped jemalloc --- Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 512d4b3..f0cce70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,20 +14,9 @@ WORKDIR /test COPY --from=build /home/gradle/project/build/reports/ . ENTRYPOINT [ "true" ] -FROM docker.io/library/debian:12.6-slim@sha256:f528891ab1aa484bf7233dbcc84f3c806c3e427571d75510a9d74bb5ec535b33 AS jemalloc -# hadolint ignore=DL3008 -RUN <