From ff05d1e8415e1235a8bea650d8591d801d1d7703 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2024 08:17:13 +0900 Subject: [PATCH] git/ci: Update CI dependencies. Updates: - all github actions - sbo-maintainer-tools - gitlab cli - gitlab ci build images - tidy up some quoting in ci.yml Signed-off-by: Andrew Clemons --- .github/workflows/ci.yml | 51 ++++++++++++++++++++++++---------------- .gitlab-ci.yml | 8 +++---- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d65552d1ae..4ed7714bb4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,17 +14,17 @@ concurrency: env: # renovate: datasource=docker depName=aclemons/sbo-maintainer-tools versioning=loose - SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.3-15.0@sha256:570ccd359aafa3df56d3316dc1f8206a1902c1e53829cf2e70dde9e8b6fc93d3 + SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.3-15.0@sha256:2e4113df24234bf103cf9e665aa450dd235b8fb8c55cfa59938abf329731a931 jobs: changes: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: read outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: show-progress: false fetch-depth: 2 @@ -33,14 +33,13 @@ jobs: - name: Get slackbuild directories which have changes. id: changed-dirs - uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c # v45.0.3 + uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf # v45.0.4 with: base_sha: ${{ github.event.pull_request.base.sha }} dir_names: true dir_names_exclude_current_dir: true dir_names_max_depth: 2 - json: true - quotepath: false + matrix: true files_ignore: | .github/** .gitignore @@ -50,20 +49,25 @@ jobs: README - name: List all changed files - run: echo '${{ steps.changed-dirs.outputs.all_changed_files }}' + env: + CHANGED_FILES: ${{ steps.changed-dirs.outputs.all_changed_files }} + run: | + printf "%s\n" "$CHANGED_FILES" - name: Get matrix output id: set-matrix + env: + CHANGED_FILES: ${{ steps.changed-dirs.outputs.all_changed_files }} run: | { printf 'matrix<> "$GITHUB_OUTPUT" sbolint: name: Checks with sbolint - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: read pull-requests: write @@ -72,13 +76,15 @@ jobs: matrix: include: ${{ fromJSON(needs.changes.outputs.matrix) }} steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: show-progress: false ref: ${{ github.head_ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Run sbolint + env: + MATRIX_DIR: ${{ matrix.dir }} run: | docker pull ${{ env.SBO_MAINTAINER_TOOLS_IMAGE }} @@ -86,16 +92,16 @@ jobs: tee sbolint-output < pipe & set +e - docker run --rm -v "$(pwd):/work" -w /work ${{ env.SBO_MAINTAINER_TOOLS_IMAGE }} sbolint "${{ matrix.dir }}" > pipe 2>&1 + docker run --rm -v "$(pwd):/work" -w /work ${{ env.SBO_MAINTAINER_TOOLS_IMAGE }} sbolint "$MATRIX_DIR" > pipe 2>&1 sbolint_status="$?" set -e { if [[ "$sbolint_status" -eq 0 ]] ; then - printf '#### ✅ sbolint - %s\n\n' "${{ matrix.dir }} ✅" + printf '#### ✅ sbolint - %s ✅\n\n' "$MATRIX_DIR" else - printf '#### ⛔️ sbolint - %s\n\n' "${{ matrix.dir }} ⛔️" + printf '#### ⛔️ sbolint - %s ⛔️\n\n' "$MATRIX_DIR" fi printf '```\n' @@ -124,7 +130,7 @@ jobs: dependencies: name: Compute reverse dependencies - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: read pull-requests: write @@ -133,31 +139,36 @@ jobs: matrix: include: ${{ fromJSON(needs.changes.outputs.matrix) }} steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: show-progress: false ref: ${{ github.head_ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Get short package name - run: printf '%s\n' "${{ matrix.dir }}" | cut -d/ -f2 | sed 's/^/PACKAGE_NAME=/' >> "$GITHUB_ENV" + run: printf '%s\n' "$MATRIX_DIR" | cut -d/ -f2 | sed 's/^/PACKAGE_NAME=/' >> "$GITHUB_ENV" + env: + MATRIX_DIR: ${{ matrix.dir }} - name: Look up dependencies id: get_deps - uses: fjogeleit/http-request-action@bf78da14118941f7e940279dd58f67e863cbeff6 # v1.16.3 + uses: fjogeleit/http-request-action@23ad54bcd1178fcff6a0d17538fa09de3a7f0a4d # v1.16.4 with: url: 'https://slackbuilds.org/revdeps.php?q=${{ env.PACKAGE_NAME }}' method: 'GET' preventFailureOnNoResponse: "true" - name: Build comment + env: + MATRIX_DIR: ${{ matrix.dir }} + DEP_RESPONSE: ${{ steps.get_deps.outputs.response }} run: | { - printf '#### reverse dependencies - %s\n\n' "${{ matrix.dir }}" - if [[ ${{ steps.get_deps.outputs.response }} == "" ]] ; then + printf '#### reverse dependencies - %s\n\n' "$MATRIX_DIR" + if [[ "$DEP_RESPONSE" == "" ]] ; then printf 'None\n' else - printf '%s' ${{ steps.get_deps.outputs.response }} | sed 's/\\n/\n/g' | sort | sed 's/^/- [ ] /' + printf '%s' "$DEP_RESPONSE" | sed 's/\\n/\n/g' | sort | sed 's/^/- [ ] /' fi } > comment-output shell: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66eb5c1bfd3..9537efaa868 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,18 @@ variables: FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true" # renovate: datasource=gitlab-releases depName=gitlab-org/cli - GLAB_VERSION: 1.47.0 + GLAB_VERSION: 1.50.0 # renovate: datasource=docker depName=aclemons/sbo-maintainer-tools versioning=loose - SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.3-15.0@sha256:570ccd359aafa3df56d3316dc1f8206a1902c1e53829cf2e70dde9e8b6fc93d3 + SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.3-15.0@sha256:2e4113df24234bf103cf9e665aa450dd235b8fb8c55cfa59938abf329731a931 workflow: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' default: - image: docker:27.3.1@sha256:8d5039800a368057d99fc0a75167d80f345ac8650850509adc7fe25c64cba9dd + image: docker:27.3.1@sha256:6ca9a6811085e2cf769cbac04bc47daf66629102990391caab7cf37426e939da services: - - docker:27.3.1-dind@sha256:8d5039800a368057d99fc0a75167d80f345ac8650850509adc7fe25c64cba9dd + - docker:27.3.1-dind@sha256:6ca9a6811085e2cf769cbac04bc47daf66629102990391caab7cf37426e939da pr-checks: script: |