system/fzf: Updated for version 0.46.1.

Also update all workflow dependencies for github and gitlab. Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
2024-02-03 09:23:23 +09:00 · 2024-02-03 09:23:23 +09:00 · e8a8335321
parent 344da37ac1
commit e8a8335321
4 changed files with 41 additions and 45 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -13,9 +13,8 @@ concurrency:
  cancel-in-progress: false

 env:
-  SBO_MAINTAINER_TOOLS_NAME: aclemons/sbo-maintainer-tools
-  # renovate: datasource=docker depName=aclemons/sbo-maintainer-tools
-  SBO_MAINTAINER_TOOLS_VERSION: 0.9.0-15.0@sha256:bad368eb4e28aac3076c6775b4a8ec96f564434657a4b853f9f961cdeed88404
+  # renovate: datasource=docker depName=aclemons/sbo-maintainer-tools versioning=docker
+  SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.0-15.0@sha256:a857eeb783622430a77ffdc0e9be0fa7d38b4d30696f362454eb990614a5ade8

 jobs:
  changes:
@ -25,15 +24,16 @@ jobs:
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
+          show-progress: false
          fetch-depth: 2
          ref: ${{ github.head_ref }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}

      - name: Get slackbuild directories which have changes.
        id: changed-dirs
-        uses: tj-actions/changed-files@c860b5c47fa71f461da850094ef2f6e3d6514e44 # v38.1.3
+        uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 # v42.0.2
        with:
          base_sha: ${{ github.event.pull_request.base.sha }}
          dir_names: true
@ -66,24 +66,21 @@ jobs:
      matrix:
        include: ${{ fromJSON(needs.changes.outputs.matrix) }}
    steps:
-      - name: Set sbo maintainer tools docker image
-        run: |
-          printf 'DOCKER_IMAGE=%s:%s\n' "${{ env.SBO_MAINTAINER_TOOLS_NAME }}" "${{ env.SBO_MAINTAINER_TOOLS_VERSION }}" >> "$GITHUB_ENV"
-
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
+          show-progress: false
          ref: ${{ github.head_ref }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}

      - name: Run sbolint
        run: |
-          docker pull ${{ env.DOCKER_IMAGE }}
+          docker pull ${{ env.SBO_MAINTAINER_TOOLS_IMAGE }}

          mkfifo pipe
          tee sbolint-output < pipe &
          set +e

-          docker run --rm -v "$(pwd):/work" -w /work ${{ env.DOCKER_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
@ -104,7 +101,7 @@ jobs:
          bash

      - name: Comment with sbolint results
-        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
        with:
          issue-number: ${{ github.event.number }}
          body-path: comment-output
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -3,16 +3,16 @@ variables:
  # renovate: datasource=gitlab-releases depName=gitlab-org/cli
  GLAB_VERSION: 1.36.0
  # renovate: datasource=docker depName=aclemons/sbo-maintainer-tools versioning=docker
-  SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.0-15.0@sha256:bad368eb4e28aac3076c6775b4a8ec96f564434657a4b853f9f961cdeed88404
+  SBO_MAINTAINER_TOOLS_IMAGE: aclemons/sbo-maintainer-tools:0.9.0-15.0@sha256:a857eeb783622430a77ffdc0e9be0fa7d38b4d30696f362454eb990614a5ade8

 workflow:
  rules:
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

 default:
-  image: docker:24.0.5
+  image: docker:25.0.2@sha256:c5353bc15e6746f7dec07a61346e9bbd2a19291d1e4306d15b745cb343dd84b5
  services:
-    - docker:24.0.5-dind
+    - docker:25.0.2-dind@sha256:c5353bc15e6746f7dec07a61346e9bbd2a19291d1e4306d15b745cb343dd84b5

 pr-checks:
  script: |
@ -56,6 +56,11 @@ pr-checks:
        printf '```\n'
      } > comment-output

-      # $CI_PROJECT_PATH points to the fork
-      GITLAB_TOKEN="$MR_AUTOMATION_TOKEN" glab mr --repo "SlackBuilds.org/slackbuilds" comment $(echo "$CI_OPEN_MERGE_REQUESTS" | cut -d '!' -f2) --unique=true --message "$(cat comment-output)"
+      if [ -z "$MR_AUTOMATION_TOKEN" ] ; then
+        printf 'No token available for MR comments\n'
+        cat comment-output
+      else
+        # $CI_PROJECT_PATH points to the fork
+        GITLAB_TOKEN="$MR_AUTOMATION_TOKEN" glab mr --repo "SlackBuilds.org/slackbuilds" comment $(echo "$CI_OPEN_MERGE_REQUESTS" | cut -d '!' -f2) --unique=true --message "$(cat comment-output)"
+      fi
    done
--- a/system/fzf/fzf.SlackBuild
+++ b/system/fzf/fzf.SlackBuild
@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)

 PRGNAM=fzf
-VERSION=${VERSION:-0.46.0}
+VERSION=${VERSION:-0.46.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@ -63,13 +63,12 @@ sed -i '/^BUILD_FLAGS/s/$/ -mod=vendor/' Makefile
 mkdir -p vendor/github.com

 for DEPENDENCY in gdamore/encoding/1.0.0 \
-                  gdamore/tcell/2.5.4 \
+                  gdamore/tcell/2.7.0 \
                  lucasb-eyer/go-colorful/1.2.0 \
                  mattn/go-isatty/0.0.17 \
-                  mattn/go-runewidth/0.0.14 \
+                  mattn/go-runewidth/0.0.15 \
                  mattn/go-shellwords/1.0.12 \
-                  rivo/uniseg/0.4.4 \
-                  junegunn/uniseg/b504da4f6ed2579e5d73ddc0feb7d74620726c40 \
+                  rivo/uniseg/0.4.6 \
                  saracen/walker/0.1.3 ; do
  DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
@ -85,7 +84,7 @@ mkdir -p vendor/golang.org/x
 for DEPENDENCY in sync/0.5.0 \
                  sys/0.16.0 \
                  term/0.15.0 \
-                  text/0.5.0 ; do
+                  text/0.14.0 ; do
  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)"
  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)"

@ -97,7 +96,7 @@ cat << EOF > vendor/modules.txt
 # github.com/gdamore/encoding v1.0.0
 ## explicit; go 1.9
 github.com/gdamore/encoding
-# github.com/gdamore/tcell/v2 v2.5.4
+# github.com/gdamore/tcell/v2 v2.7.0
 ## explicit; go 1.12
 github.com/gdamore/tcell/v2
 github.com/gdamore/tcell/v2/encoding
@ -139,22 +138,19 @@ github.com/gdamore/tcell/v2/terminfo/x/xfce
 github.com/gdamore/tcell/v2/terminfo/x/xterm
 github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty
 github.com/gdamore/tcell/v2/terminfo/x/xterm_termite
-# github.com/junegunn/uniseg v0.0.0-20240120174029-b504da4f6ed2
-## explicit; go 1.18
-github.com/junegunn/uniseg
 # github.com/lucasb-eyer/go-colorful v1.2.0
 ## explicit; go 1.12
 github.com/lucasb-eyer/go-colorful
 # github.com/mattn/go-isatty v0.0.17
 ## explicit; go 1.15
 github.com/mattn/go-isatty
-# github.com/mattn/go-runewidth v0.0.14
+# github.com/mattn/go-runewidth v0.0.15
 ## explicit; go 1.9
 github.com/mattn/go-runewidth
 # github.com/mattn/go-shellwords v1.0.12
 ## explicit; go 1.13
 github.com/mattn/go-shellwords
-# github.com/rivo/uniseg v0.4.4
+# github.com/rivo/uniseg v0.4.6
 ## explicit; go 1.18
 github.com/rivo/uniseg
 # github.com/saracen/walker v0.1.3
@ -171,8 +167,8 @@ golang.org/x/sys/windows
 # golang.org/x/term v0.16.0
 ## explicit; go 1.18
 golang.org/x/term
-# golang.org/x/text v0.5.0
-## explicit; go 1.17
+# golang.org/x/text v0.14.0
+## explicit; go 1.18
 golang.org/x/text/encoding
 golang.org/x/text/encoding/charmap
 golang.org/x/text/encoding/internal
--- a/system/fzf/fzf.info
+++ b/system/fzf/fzf.info
@ -1,34 +1,32 @@
 PRGNAM="fzf"
-VERSION="0.46.0"
+VERSION="0.46.1"
 HOMEPAGE="https://github.com/junegunn/fzf"
-DOWNLOAD="https://github.com/junegunn/fzf/archive/0.46.0/fzf-0.46.0.tar.gz \
+DOWNLOAD="https://github.com/junegunn/fzf/archive/0.46.1/fzf-0.46.1.tar.gz \
          https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \
-          https://github.com/gdamore/tcell/archive/v2.5.4/tcell-2.5.4.tar.gz \
+          https://github.com/gdamore/tcell/archive/v2.7.0/tcell-2.7.0.tar.gz \
          https://github.com/lucasb-eyer/go-colorful/archive/v1.2.0/go-colorful-1.2.0.tar.gz \
          https://github.com/mattn/go-isatty/archive/v0.0.17/go-isatty-0.0.17.tar.gz \
-          https://github.com/mattn/go-runewidth/archive/v0.0.14/go-runewidth-0.0.14.tar.gz \
+          https://github.com/mattn/go-runewidth/archive/v0.0.15/go-runewidth-0.0.15.tar.gz \
          https://github.com/mattn/go-shellwords/archive/v1.0.12/go-shellwords-1.0.12.tar.gz \
-          https://github.com/rivo/uniseg/archive/v0.4.4/uniseg-0.4.4.tar.gz \
-          https://github.com/junegunn/uniseg/archive/b504da4f6ed2579e5d73ddc0feb7d74620726c40/uniseg-b504da4f6ed2579e5d73ddc0feb7d74620726c40.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.4.6/uniseg-0.4.6.tar.gz \
          https://github.com/saracen/walker/archive/v0.1.3/walker-0.1.3.tar.gz \
          https://github.com/golang/sync/archive/v0.5.0/sync-0.5.0.tar.gz \
          https://github.com/golang/sys/archive/v0.16.0/sys-0.16.0.tar.gz \
          https://github.com/golang/term/archive/v0.15.0/term-0.15.0.tar.gz \
-          https://github.com/golang/text/archive/v0.5.0/text-0.5.0.tar.gz"
-MD5SUM="78b3760921850db279ff8619455eb5a9 \
+          https://github.com/golang/text/archive/v0.14.0/text-0.14.0.tar.gz"
+MD5SUM="91a189b1f67ff47c1ecdc11821cd4127 \
        fbadc383bc1ace79fa769fe2de36b87b \
-        0c62c60df9d5def197b42b03455ae530 \
+        d450ed1f54628baab05d27a7cf174843 \
        191fe5cfcb58e480ff4045c82a06091a \
        aa907df23bb8877028111b14177f9e5d \
-        c41abbf9dc5def08ef8e6999efbe2c8c \
+        3da9ee6fafe706e99bd88ac86023f6a5 \
        71a4ecaadfb90ffccb392799a2f00743 \
-        4e272ceb8899ee895e425f16347d10a6 \
-        e7dfafba83a811134a708a4e60db3769 \
+        728afb799b7278f6fd30edfb00b82dbd \
        53fe699576f9f4799079b92bd6c5fe8c \
        a8371f5f0569f41210ca8a3f30e445c6 \
        49a67b079ddb6482675ef7c2fdbeea5c \
        96d50cf5392716166089e16370b6f9a2 \
-        e812f0c57a85390d7fe8652c01238d56"
+        9f64144d4b1647ce4597abf657028a8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"