From a5b049f80aa6fe549be0fea6af57f8158659b9d7 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sun, 21 Mar 2021 00:54:35 +0100 Subject: [PATCH 1/2] build: update please Signed-off-by: Mark Sagi-Kazar --- .plzconfig | 2 +- BUILD | 2 +- pleasew | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.plzconfig b/.plzconfig index 964c85d..4ded3b2 100644 --- a/.plzconfig +++ b/.plzconfig @@ -1,5 +1,5 @@ [please] -version = 15.5.0 +version = 16.0.0-prerelease.13 [go] importpath = emperror.dev/errors diff --git a/BUILD b/BUILD index bfd971d..369165a 100644 --- a/BUILD +++ b/BUILD @@ -1,7 +1,7 @@ github_repo( name = "pleasings2", repo = "sagikazarmark/mypleasings", - revision = "f8a12721c6f929db3e227e07c152d428ac47ab1b", + revision = "ae0d49ae0eac8d227d202e9aed3b1b1b8915c073", ) sh_cmd( diff --git a/pleasew b/pleasew index 51bab8c..9305744 100755 --- a/pleasew +++ b/pleasew @@ -22,7 +22,7 @@ fi # If this exists at any version, let it handle any update. TARGET="${LOCATION}/please" if [ -f "$TARGET" ]; then - exec "$TARGET" "$@" + exec "$TARGET" ${PLZ_ARGS:-} "$@" fi URL_BASE="`grep -i "^downloadlocation" .plzconfig | cut -d '=' -f 2 | tr -d ' '`" @@ -67,6 +67,5 @@ curl -fsSL "${PLEASE_URL}" | tar -xJpf- --strip-components=1 -C "$DIR" for x in `ls "$DIR"`; do ln -sf "${DIR}/${x}" "$LOCATION" done -ln -sf "${DIR}/please" "${LOCATION}/plz" echo -e >&2 "${GREEN}Should be good to go now, running plz...${RESET}" -exec "$TARGET" "$@" +exec "$TARGET" ${PLZ_ARGS:-} "$@" From 3e829b4afe5a20a8466dbf6f433f9d13f6f88165 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sun, 21 Mar 2021 01:12:16 +0100 Subject: [PATCH 2/2] ci: update go version Signed-off-by: Mark Sagi-Kazar --- .github/workflows/checks.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 958f5bb..ed51732 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -16,10 +16,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.16 - name: Set up GOPATH - run: echo "::set-env name=GOPATH::$(go env GOPATH)" + run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 207f5e1..914d880 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.11', '1.12', '1.13', '1.14', '1.15'] + go: ['1.11', '1.12', '1.13', '1.14', '1.15', '1.16'] env: GOFLAGS: -mod=readonly GOPROXY: https://proxy.golang.org @@ -51,7 +51,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.16 - name: Checkout code uses: actions/checkout@v2