From 6d70ef996f147e7257283d3dac7c5a8d808efc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sun, 20 Oct 2024 14:23:08 +0800 Subject: [PATCH] Update workflows --- .github/renovate.json | 19 ++++++ .github/workflows/debug.yml | 43 -------------- .github/workflows/lint.yml | 21 ++++--- .github/workflows/test.yml | 112 ++++++++++++++++++++++++++++++++++++ .gitignore | 1 + .golangci.yml | 7 ++- Makefile | 12 ++-- 7 files changed, 153 insertions(+), 62 deletions(-) create mode 100644 .github/renovate.json delete mode 100644 .github/workflows/debug.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..6612115 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "commitMessagePrefix": "[dependencies]", + "extends": [ + "config:base", + ":disableRateLimiting" + ], + "golang": { + "enabled": false + }, + "packageRules": [ + { + "matchManagers": [ + "github-actions" + ], + "groupName": "github-actions" + } + ] +} \ No newline at end of file diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml deleted file mode 100644 index fcbf9cb..0000000 --- a/.github/workflows/debug.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Debug build - -on: - push: - branches: - - main - paths-ignore: - - '**.md' - - '.github/**' - - '!.github/workflows/debug.yml' - pull_request: - branches: - - main - -jobs: - build: - name: Debug build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Get latest go version - id: version - run: | - echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g') - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: ${{ steps.version.outputs.go_version }} - - name: Add cache to Go proxy - run: | - version=`git rev-parse HEAD` - mkdir build - pushd build - go mod init build - go get -v github.com/sagernet/sing-mux@$version - popd - continue-on-error: true - - name: Build - run: | - make test diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0a1c8f2..c682b25 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,8 +1,9 @@ -name: Lint +name: lint on: push: branches: + - main - dev paths-ignore: - '**.md' @@ -10,6 +11,7 @@ on: - '!.github/workflows/lint.yml' pull_request: branches: + - main - dev jobs: @@ -18,24 +20,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Get latest go version - id: version - run: | - echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g') - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: ${{ steps.version.outputs.go_version }} + go-version: ^1.23 - name: Cache go module - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/pkg/mod key: go-${{ hashFiles('**/go.sum') }} - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: latest \ No newline at end of file + version: latest + args: . \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..3afe968 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,112 @@ +name: test + +on: + push: + branches: + - main + - dev + paths-ignore: + - '**.md' + - '.github/**' + - '!.github/workflows/debug.yml' + pull_request: + branches: + - main + - dev + +jobs: + build: + name: Linux + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ^1.23 + - name: Build + run: | + make test + build_go120: + name: Linux (Go 1.20) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ~1.20 + continue-on-error: true + - name: Build + run: | + make test + build_go121: + name: Linux (Go 1.21) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ~1.21 + continue-on-error: true + - name: Build + run: | + make test + build_go122: + name: Linux (Go 1.22) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ~1.22 + continue-on-error: true + - name: Build + run: | + make test + build_windows: + name: Windows + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ^1.23 + continue-on-error: true + - name: Build + run: | + make test + build_darwin: + name: macOS + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ^1.23 + continue-on-error: true + - name: Build + run: | + make test \ No newline at end of file diff --git a/.gitignore b/.gitignore index f7f8ac3..f1298ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.idea/ /vendor/ +.DS_Store diff --git a/.golangci.yml b/.golangci.yml index 4133a1d..eecfec3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,6 +5,8 @@ linters: - govet - gci - staticcheck + - paralleltest + - ineffassign linters-settings: gci: @@ -13,5 +15,6 @@ linters-settings: - standard - prefix(github.com/sagernet/) - default - staticcheck: - go: '1.20' + +run: + go: "1.23" \ No newline at end of file diff --git a/Makefile b/Makefile index e47456e..6985f48 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,14 @@ fmt_install: go install -v github.com/daixiang0/gci@latest lint: - GOOS=linux golangci-lint run ./... - GOOS=android golangci-lint run ./... - GOOS=windows golangci-lint run ./... - GOOS=darwin golangci-lint run ./... - GOOS=freebsd golangci-lint run ./... + GOOS=linux golangci-lint run + GOOS=android golangci-lint run + GOOS=windows golangci-lint run + GOOS=darwin golangci-lint run + GOOS=freebsd golangci-lint run lint_install: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest test: - go test -v ./... \ No newline at end of file + go test ./...