diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75d2cfc..0c587fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,14 @@ name: ci on: push: branches: - - 'master' + - 'main' - 'release/*' - 'CBG*' - 'ci-*' - 'feature*' pull_request: branches: - - 'master' + - 'main' - 'release/*' jobs: @@ -26,9 +26,10 @@ jobs: name: addlicense runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.21.1 + go-version: 1.21.3 - run: go install github.com/google/addlicense@latest - uses: actions/checkout@v3 - run: addlicense -check -f licenses/addlicense.tmpl . @@ -40,11 +41,10 @@ jobs: matrix: os: [macos-latest, windows-latest, ubuntu-latest] steps: - - name: Setup Go Faster - uses: WillAbides/setup-go-faster@v1.8.0 - with: - go-version: 1.21.1 - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 + with: + go-version: 1.21.3 - name: Build run: go build -v "./..." - name: Run Tests @@ -59,10 +59,8 @@ jobs: golangci: name: lint runs-on: ubuntu-latest + steps: - - uses: WillAbides/setup-go-faster@v1.8.0 - with: - go-version: 1.21.1 - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -72,10 +70,10 @@ jobs: test-race: runs-on: ubuntu-latest steps: - - uses: WillAbides/setup-go-faster@v1.8.0 - with: - go-version: 1.21.1 - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 + with: + go-version: 1.21.3 - name: Run Tests run: go test -race -timeout=30m -count=1 -json -v "./..." | tee test.json | jq -s -jr 'sort_by(.Package,.Time) | .[].Output | select (. != null )' shell: bash