From 8d987df13252826f8e6afa9a5a2bc71c2fa16c88 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Thu, 21 Apr 2022 14:34:42 -0400 Subject: [PATCH] Ci config trimming (#1355) * add ProgramName and CommandName variables * add comments to variables * add test case * refer program name instead of app name * Update command_test.go add err to the log * fix failing tests * Cut out many CI things that either don't work on v1 anymore or are specific to the `master` branch. * More general v1 branch CI updates :-/ * More ~fighting~ playing with CI bits * Drop back to only testing go 1.16.x as 1.15.x is no longer supported by the Go team and both 1.17.x and 1.18.x can't run the tests * Back out some changes from #973 Co-authored-by: Ajitem Sahasrabuddhe --- .github/workflows/cli.yml | 60 +++++++++++++-------------------------- .gitignore | 3 +- 2 files changed, 21 insertions(+), 42 deletions(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index c06a112b99..f95ee2e607 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -3,63 +3,41 @@ name: Run Tests on: pull_request: branches: - - master - v1 - -env: - GO111MODULE: on - GOPROXY: https://proxy.golang.org + push: + branches: + - v1 + tags: + - v1.* jobs: test: strategy: matrix: os: [ubuntu-latest, macos-latest] - go: [1.11, 1.12, 1.13] + go: + - 1.16.x + # NOTE: tests fail with panic at + # TestApp_RunAsSubCommandIncorrectUsage on these + # versions: + # - 1.17.x + # - 1.18.x name: ${{ matrix.os }} @ Go ${{ matrix.go }} runs-on: ${{ matrix.os }} steps: - name: Set up Go ${{ matrix.go }} - uses: actions/setup-go@v1 + uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} - - name: Set GOPATH and PATH - run: | - echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" - echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin" - shell: bash - - name: Checkout Code - uses: actions/checkout@v1 - with: - ref: ${{ github.ref }} + uses: actions/checkout@v3 - name: Install Dependencies - run: | - mkdir -p $GOPATH/bin - curl -L -o $GOPATH/bin/gfmrun "https://github.com/urfave/gfmrun/releases/download/v1.2.14/gfmrun-$(go env GOOS)-amd64-v1.2.14" - chmod +x $GOPATH/bin/gfmrun - npm install markdown-toc + run: npm install markdown-toc - - name: Run Tests (v1) - if: contains(github.base_ref, 'v1') - run: | - go run build.go vet - go run build.go test - go run build.go gfmrun docs/v1/manual.md + - name: Run Tests + run: + go run build.go vet && + go run build.go test && go run build.go toc docs/v1/manual.md - - - name: Run Tests (v2) - if: contains(github.base_ref, 'master') - run: | - go run build.go vet - go run build.go test - go run build.go gfmrun docs/v2/manual.md - go run build.go toc docs/v2/manual.md - - - name: Send Coverage Report - if: success() - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - run: bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9c2506032c..8ae196feed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.coverprofile +coverage.txt node_modules/ vendor -.idea \ No newline at end of file +.idea