Merge pull request #10 from urfave/v1.6.0-prep

Preparing for v1.6.0 release
urfave · Oct 17, 2022 · e9e151f · e9e151f
2 parents 924df1d + ffa5cc1
commit e9e151f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,28 +18,45 @@ jobs:
             goos: linux
             goarch: amd64
             target: native
-        # TODO: more matrix entries
+          # - runner: ubuntu-latest
+          #   goos: linux
+          #   goarch: arm64
+          #   target: arm64
+          - runner: macos-latest
+            goos: darwin
+            goarch: amd64
+            target: native
+          # - runner: macos-latest
+          #   goos: darwin
+          #   goarch: arm64
+          #   target: arm64
     runs-on: ${{ matrix.env.runner }}
     env:
       TARGET: ${{ matrix.env.target }}
       GOOS: ${{ matrix.env.goos }}
       GOARCH: ${{ matrix.env.goarch }}
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: ${HOME}/.gimme
+          key: "${{ runner.os }}-${{ matrix.env.target }}-gimme-${{ hashFiles('.testdata/*-${{ matrix.env.goos }}') }}"
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.env.target }}-gimme-
       - run: printf 'GIMME_TMP=%s\n' "${RUNNER_TEMP}" | tee -a "${GITHUB_ENV}"
       - run: printf 'UNAME=%s\n' "$(uname | tr '[:upper:]' '[:lower:]')" | tee -a "${GITHUB_ENV}"
       - run: |
-          GO_VERSIONS="$(sed -n -e '/^[^#]/p' < .testdata/sample-binary-$UNAME) $(sed -n -e '/^[^#]/p' < .testdata/source-$UNAME)"
-          printf 'GO_VERSIONS=%s\n' "$(echo "${GO_VERSIONS}" | tr '\n' ' ')" | tee -a "${GITHUB_ENV}"
+          GO_VERSIONS="$(sed -n -e '/^[^#]/p' < .testdata/sample-binary-$UNAME) $(sed -n -e '/^[^#]/p' < .testdata/source-$UNAME)";
+          printf 'GO_VERSIONS=%s\n' "$(echo "${GO_VERSIONS}" | tr '\n' ' ')" | tee -a "${GITHUB_ENV}";
       - run: printf 'PATH=%s\n' "${HOME}/bin:${PATH}" | tee -a "${GITHUB_ENV}"
       - run: mkdir -p "${HOME}/bin"
-      - run:
+      - run: |
           if [ $UNAME = linux ] && [[ $(shellcheck --version | awk '/^version:/ { print $2 }') != 0.7.1 ]] ; then
             curl -sSL -o "${GIMME_TMP}/shellcheck.tar.xz" "${SHELLCHECK_URL}";
             tar -C "${HOME}/bin" --exclude="*.txt" --strip-components=1 -xf "${GIMME_TMP}/shellcheck.tar.xz";
             shellcheck --version;
           fi
-      - run: 
+      - run: |
           if [ $UNAME = linux ] && [[ $(shfmt -version 2>/dev/null) != v3.5.1 ]] ; then
             curl -sSL "${SHFMT_URL}" -o "${HOME}/bin/shfmt";
             chmod +x "${HOME}/bin/shfmt";
@@ -50,5 +67,6 @@ jobs:
       - run: git diff --cached --exit-code
       - run: ./gimme -h
       - run: ./gimme -V
+      - run: ./gimme -l
       - run: ./runtests "${TARGET}" "${GO_BOOTSTRAP_VERSION}" ${GO_VERSIONS}
       - run: ./gimme -l
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+> **NOTE**: This file is no longer actively maintained. For
+> releases 1.5.4+ please refer to the relevant github releases page
+> for changelog-style notes.
+
 # Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,13 +1,16 @@
 gimme was built by these wonderful humans:
+- Abhinav Gupta
 - Alexey Palazhchenko
 - Andrew Stone
+- Arek Rus
 - Asato Wakisaka
 - Ben Burkert
 - Carmen Andoh
 - Cezar Sa Espinola
 - Dan Buch
 - Daniel Martí
 - Dan Peterson
+- Dominic Jodoin
 - Dylan Waits
 - Euan Kemp
 - Florin Patan
@@ -17,6 +20,8 @@ gimme was built by these wonderful humans:
 - Geoff Levand
 - Hiro Asari
 - Hiroshi Ioka
+- Joep van Delft
+- Jules Denardou
 - Koichi Shiraishi
 - lupan2005
 - Matt Larraz
@@ -25,6 +30,7 @@ gimme was built by these wonderful humans:
 - Nathan Youngman
 - Otto Jongerius
 - Phil Pennock
+- Robert Mazur
 - Thomas Heller
 - Tianon Gravi
 - Tom Cahill
diff --git a/gimme b/gimme
@@ -54,7 +54,7 @@ set -o pipefail
 
 [[ ${GIMME_DEBUG} ]] && set -x
 
-readonly GIMME_VERSION="v1.5.4"
+readonly GIMME_VERSION="v1.6.0"
 readonly GIMME_COPYRIGHT="Copyright (c) 2022 gimme contributors"
 readonly GIMME_LICENSE_URL="https://raw.githubusercontent.com/urfave/gimme/${GIMME_VERSION}/LICENSE"
 export GIMME_VERSION
@@ -285,7 +285,7 @@ _extract() {
 
 # _setup_bootstrap
 _setup_bootstrap() {
-	local versions=("1.18" "1.17" "1.16" "1.15" "1.14" "1.13" "1.12" "1.11" "1.10" "1.9" "1.8" "1.7" "1.6" "1.5" "1.4")
+	local versions=("1.19" "1.18" "1.17")
 
 	# try existing
 	for v in "${versions[@]}"; do