From ce7c3e80390cfdb381c3e961770577307a7a7a8d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 24 Feb 2024 01:18:02 +0100 Subject: [PATCH] CI: Use gh instead of hub --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a987f8d7..34dbba7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1479,7 +1479,7 @@ jobs: - name: Install packages env: DEBIAN_FRONTEND: noninteractive - run: sudo apt install -y git hub + run: sudo apt install -y git jq gh - name: Checkout uses: actions/checkout@v4 with: @@ -1487,7 +1487,7 @@ jobs: - name: Show release assets env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: hub release show -f "%as" ${{github.event.release.tag_name}} + run: gh release view "${{github.event.release.tag_name}}" --json assets | jq -r '.assets[].name' - name: Download artifacts uses: actions/download-artifact@v4 with: @@ -1498,7 +1498,7 @@ jobs: run: | echo "Release version: ${{github.event.release.tag_name}}" filenames=() - a_files=() + files=() for i in $(find artifacts -type f); do filename=$(basename $i) if [[ ${filenames[@]} =~ ${filename} ]]; then @@ -1506,16 +1506,16 @@ jobs: continue fi filenames+=("${filename}") - existing_asset=$(hub release show -f "%as" ${{github.event.release.tag_name}} | tr -d '[:blank:]' | grep ".*/${filename}\$" 2>/dev/null || true) + existing_asset=$(gh release view "${{github.event.release.tag_name}}" --json assets | jq -r '.assets[].name' | tr -d '[:blank:]' | grep ".*/${filename}\$" 2>/dev/null || true) if [ "${existing_asset}" = "" ]; then echo "Adding file: ${filename}" - a_files+=("-a" "${i}") + files+=("${i}") else echo "Release already has file: ${filename}" fi done - a_files_list="${a_files[@]}" - if ! [ "${a_files_list}" = "" ]; then + files_list="${files[@]}" + if ! [ "${files_list}" = "" ]; then echo "Adding files to GitHub release" - hub release edit -m "Strawberry ${{github.event.release.tag_name}}" ${a_files_list} "${{github.event.release.tag_name}}" + gh release upload "${{github.event.release.tag_name}}" ${files_list} fi