From 3f93222e4075ad48f4acf2da96c1172642342eaf Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Fri, 4 Nov 2022 16:09:04 -0500 Subject: [PATCH 1/2] add goreleaser support to build regularly again probably do not need travis anymore either disable lint in travis ci since it is broken --- .github/workflows/release.yml | 38 +++++++++++++++++++++++++++++++++++ .travis.yml | 6 +++--- Makefile | 12 +++++------ 3 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..934612a3 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,38 @@ +name: Release + +on: + push: + # run only against tags + tags: + - '*' + +permissions: + contents: write + packages: write + # issues: write + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - run: git fetch --force --tags + - uses: actions/setup-go@v3 + with: + go-version: '>=1.19.3' + cache: true + # More assembly might be required: Docker logins, GPG, etc. It all depends + # on your needs. + - uses: goreleaser/goreleaser-action@v2 + with: + # either 'goreleaser' (default) or 'goreleaser-pro': + distribution: goreleaser + version: latest + args: release --rm-dist + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' + # distribution: + # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} diff --git a/.travis.yml b/.travis.yml index 41bc4b8b..a4db20fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ jobs: - os: osx osx_image: xcode12 language: go - go: 1.16.x + go: 1.19.x - os: linux - dist: bionic + dist: focal services: docker language: go - go: 1.16.x + go: 1.19.x git: depth: false addons: diff --git a/Makefile b/Makefile index 8276288e..f1562270 100644 --- a/Makefile +++ b/Makefile @@ -352,14 +352,14 @@ $(patsubst %,%.darwin.so,$(PLUGINS)): GOOS=darwin go build -o $@ -ldflags "$(VERSION_LDFLAGS)" -buildmode=plugin ./plugins/$(patsubst %.darwin.so,%,$@) # Run code tests and lint. -test: lint +test: # lint # Testing. go test -race -covermode=atomic ./... -lint: - # Checking lint. - GOOS=linux $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) - GOOS=freebsd $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) - GOOS=windows $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) +#lint: +# # Checking lint. +# GOOS=linux $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) +# GOOS=freebsd $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) +# GOOS=windows $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) # Mockgen and bindata are examples. # Your `go generate` may require other tools; add them! From ff10f9cc2f23c35cc2968bc4a868d7488c44bfc0 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Sat, 5 Nov 2022 08:32:45 -0500 Subject: [PATCH 2/2] keep a backup of travis for now but fully disable --- .github/workflows/build.yml | 58 ++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 4 +-- .travis.yml => .travis.yml-bak | 0 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build.yml rename .travis.yml => .travis.yml-bak (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..9ac2ace8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,58 @@ +name: Build + +on: [push] + +permissions: + contents: read + # Optional: allow read access to pull request. Use with `only-new-issues` option. + # pull-requests: read + +jobs: + test: + strategy: + matrix: + go: [1.19] + os: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go }} + + - name: Build + run: go build -v ./... + + - name: Test + run: go test -v ./... + lint: + strategy: + matrix: + go: [1.19] + os: [ubuntu-latest, macos-latest, windows-latest] + name: lint + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go }} + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. + version: v1.50.1 + # Optional: working directory, useful for monorepos + # working-directory: somedir + + # Optional: golangci-lint command line arguments. + # args: --issues-exit-code=0 + args: --timeout=3m + # we have installed go already + skip-go-installation: true + + # Optional: show only new issues if it's a pull request. The default value is `false`. + # only-new-issues: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 934612a3..e3d0e165 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,11 +28,11 @@ jobs: - uses: goreleaser/goreleaser-action@v2 with: # either 'goreleaser' (default) or 'goreleaser-pro': - distribution: goreleaser + distribution: goreleaser-pro version: latest args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' # distribution: - # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} diff --git a/.travis.yml b/.travis.yml-bak similarity index 100% rename from .travis.yml rename to .travis.yml-bak