diff --git a/.github/generate-authors.sh b/.github/generate-authors.sh index 6152721..5468af8 100755 --- a/.github/generate-authors.sh +++ b/.github/generate-authors.sh @@ -12,8 +12,9 @@ set -e SCRIPT_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) -GIT_WORKDIR=${GITHUB_WORKSPACE:-$(git rev-parse --show-toplevel)} -AUTHORS_PATH="${GIT_WORKDIR}/AUTHORS.txt" +if [ -z "${AUTHORS_PATH}" ]; then + AUTHORS_PATH="$GITHUB_WORKSPACE/AUTHORS.txt" +fi if [ -f ${SCRIPT_PATH}/.ci.conf ]; then . ${SCRIPT_PATH}/.ci.conf @@ -41,7 +42,12 @@ shouldBeIncluded () { IFS=$'\n' #Only split on newline -for CONTRIBUTOR in $(git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf); do +for CONTRIBUTOR in $( + ( + git log --format='%aN <%aE>' + git log --format='%(trailers:key=Co-authored-by)' | sed -n 's/^[^:]*:\s*//p' + ) | LC_ALL=C.UTF-8 sort -uf +); do if shouldBeIncluded ${CONTRIBUTOR}; then CONTRIBUTORS+=("${CONTRIBUTOR}") fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5b64e0..ac2fe3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: with: go-version: '1.18' # auto-update/latest-go-version - name: Build and release - uses: goreleaser/goreleaser-action@v3 + uses: goreleaser/goreleaser-action@v4 with: version: latest args: release --rm-dist diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 93d0406..0d9125f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.17", "1.18"] # auto-update/supported-go-version-list + go: ['1.19', '1.18'] # auto-update/supported-go-version-list fail-fast: false name: Go ${{ matrix.go }} steps: @@ -67,7 +67,7 @@ jobs: -v -race 2>&1 | grep -v '^go: downloading' | tee /tmp/gotest.log | gotestfmt - name: Upload test log - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: test-log-${{ matrix.go }} @@ -79,7 +79,7 @@ jobs: if [ -f .github/.ci.conf ]; then . .github/.ci.conf; fi if [ -n "${TEST_HOOK}" ]; then ${TEST_HOOK}; fi - - uses: codecov/codecov-action@v2 + - uses: codecov/codecov-action@v3 with: name: codecov-umbrella fail_ci_if_error: true @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.17", "1.18"] # auto-update/supported-go-version-list + go: ['1.19', '1.18'] # auto-update/supported-go-version-list fail-fast: false name: Go i386 ${{ matrix.go }} steps: @@ -145,7 +145,7 @@ jobs: - name: Download Go run: curl -sSfL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -C ~ -xzf - env: - GO_VERSION: 1.17 # auto-update/latest-go-version + GO_VERSION: '1.19' # auto-update/latest-go-version - name: Set Go Root run: echo "GOROOT=${HOME}/go" >> $GITHUB_ENV @@ -167,7 +167,7 @@ jobs: -exec="${GO_JS_WASM_EXEC}" \ -v ./... - - uses: codecov/codecov-action@v2 + - uses: codecov/codecov-action@v3 with: name: codecov-umbrella fail_ci_if_error: true diff --git a/.github/workflows/tidy-check.yaml b/.github/workflows/tidy-check.yaml index ff2ef50..50cc17a 100644 --- a/.github/workflows/tidy-check.yaml +++ b/.github/workflows/tidy-check.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.17 # auto-update/latest-go-version + go-version: '1.19' # auto-update/latest-go-version - name: check run: | go mod download