chore: update CI

* chore: update CI

* chore: update CI

.github/workflows/go-cross.yml

@@ -17,7 +17,7 @@ jobs:
 
  strategy:
  matrix:
- go-version: [ '1.21', '1.22' ]
+ go-version: [ oldstable, stable ]
  os: [ubuntu-latest, macos-latest, windows-latest]
 
  include:
@@ -29,36 +29,18 @@ jobs:
  go-path-suffix: \go
 
  steps:
- # https://github.com/marketplace/actions/setup-go-environment
- - name: Set up Go ${{ matrix.go-version }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ matrix.go-version }}
- stable: true
-
  # https://github.com/marketplace/actions/checkout
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  path: go/src/github.com/traefik/yaegi
 
- # https://github.com/marketplace/actions/cache
- - name: Cache Go modules
- uses: actions/cache@v3
+ # https://github.com/marketplace/actions/setup-go-environment
+ - name: Set up Go ${{ matrix.go-version }}
+ uses: actions/setup-go@v5
  with:
- # In order:
- # * Module download cache
- # * Build cache (Linux)
- # * Build cache (Mac)
- # * Build cache (Windows)
- path: |
- ~/go/pkg/mod
- ~/.cache/go-build
- ~/Library/Caches/go-build
- %LocalAppData%\go-build
- key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-${{ matrix.go-version }}-go-
+ go-version: ${{ matrix.go-version }}
+ stable: true
 
  - name: Setup GOPATH
  run: go env -w GOPATH=${{ github.workspace }}${{ matrix.go-path-suffix }}

.github/workflows/main.yml

@@ -7,25 +7,25 @@ on:
  pull_request:
 
 env:
- GO_VERSION: '1.22'
- GOLANGCI_LINT_VERSION: v1.55.2
+ GO_VERSION: stable
+ GOLANGCI_LINT_VERSION: v1.56.2
 
 jobs:
 
  linting:
  name: Linting
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go ${{ env.GO_VERSION }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ env.GO_VERSION }}
-
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 
+ - name: Set up Go ${{ env.GO_VERSION }}
+ uses: actions/setup-go@v5
+ with:
+ go-version: ${{ env.GO_VERSION }}
+
  - name: Check and get dependencies
  run: |
  go mod tidy
@@ -45,19 +45,19 @@ jobs:
  needs: linting
  strategy:
  matrix:
- go-version: [ '1.21', '1.22' ]
+ go-version: [ oldstable, stable ]
  steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+
  - name: Set up Go ${{ matrix.go-version }}
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v5
  with:
  go-version: ${{ matrix.go-version }}
  stable: true
 
- - name: Check out code
- uses: actions/checkout@v2
- with:
- fetch-depth: 0
-
  - name: Check generated code
  run: |
  rm -f interp/op.go
@@ -76,21 +76,21 @@ jobs:
  working-directory: ${{ github.workspace }}/go/src/github.com/traefik/yaegi
  strategy:
  matrix:
- go-version: [ '1.21', '1.22' ]
+ go-version: [ oldstable, stable ]
 
  steps:
- - name: Set up Go ${{ matrix.go-version }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ matrix.go-version }}
- stable: true
-
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  path: go/src/github.com/traefik/yaegi
  fetch-depth: 0
 
+ - name: Set up Go ${{ matrix.go-version }}
+ uses: actions/setup-go@v5
+ with:
+ go-version: ${{ matrix.go-version }}
+ stable: true
+
  # https://github.com/marketplace/actions/cache
  - name: Cache Go modules
  uses: actions/cache@v3

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
  - v[0-9]+.[0-9]+*
 
 env:
- GO_VERSION: '1.21'
+ GO_VERSION: stable
 
 jobs:
 
@@ -15,28 +15,20 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - name: Set up Go ${{ env.GO_VERSION }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ env.GO_VERSION }}
-
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 
- - name: Cache Go modules
- uses: actions/cache@v3
+ - name: Set up Go ${{ env.GO_VERSION }}
+ uses: actions/setup-go@v5
  with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
+ go-version: ${{ env.GO_VERSION }}
 
  - name: Run GoReleaser
- uses: goreleaser/goreleaser-action@v2
+ uses: goreleaser/goreleaser-action@v5
  with:
  version: latest
- args: release --rm-dist
+ args: release --clean
  env:
  GITHUB_TOKEN: ${{ secrets.GH_TOKEN_REPO }}

.golangci.yml

@@ -142,9 +142,10 @@ linters:
 
 issues:
  exclude-use-default: false
- max-per-linter: 0
+ max-issues-per-linter: 0
  max-same-issues: 0
- exclude: []
+ exclude:
+ - 'fmt.Sprintf can be replaced with string'
  exclude-rules:
  - path: .+_test\.go
  linters:

.goreleaser.yml

@@ -47,7 +47,7 @@ archives:
  - LICENSE
 
 brews:
- - tap:
+ - repository:
  owner: traefik
  name: homebrew-tap
  commit_author:

cmd/yaegi/extract.go

@@ -3,6 +3,7 @@ package main
 import (
  "bufio"
  "bytes"
+ "errors"
  "flag"
  "fmt"
  "io"
@@ -38,7 +39,7 @@ func extractCmd(arg []string) error {
 
  args := eflag.Args()
  if len(args) == 0 {
- return fmt.Errorf("missing package")
+ return errors.New("missing package")
  }
 
  license, err := genLicense(licensePath)

extract/extract.go

@@ -387,7 +387,7 @@ func (e *Extractor) importPath(pkgIdent, importPath string) (string, error) {
  return "", err
  }
  if err != nil {
- if len(pkgIdent) > 0 && pkgIdent[0] == '.' {
+ if pkgIdent != "" && pkgIdent[0] == '.' {
  // pkgIdent is definitely a relative path, not a package name, and it does not exist
  return "", err
  }