diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index eecfdcc..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,71 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [master] - pull_request: - # The branches below must be a subset of the branches above - branches: [master] - schedule: - - cron: "15 21 * * 2" - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: ["go"] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # â„šī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..3f96ba1 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,22 @@ +name: golangci-lint +on: + pull_request: + branches: + - master +jobs: + lint: + strategy: + matrix: + go-version: [1.24] + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: ${{ matrix.go-version }} + + - name: Golangci-lint + uses: golangci/golangci-lint-action@v7 diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index eea43b6..f2a3870 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -1,13 +1,10 @@ -name: unittest +name: unit test on: - push: - branches: - - master pull_request: branches: - master jobs: - run_test: + test: strategy: matrix: go-version: [1.24] @@ -20,12 +17,6 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - id: go - - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.50.0 - name: Run test run: go test -v -race ./... diff --git a/gih/main.go b/gih/main.go index d357c30..08cba2d 100644 --- a/gih/main.go +++ b/gih/main.go @@ -55,8 +55,14 @@ func main() { } if flag.Arg(0) == "version" { - fmt.Fprintf(os.Stdout, "git-here %s\n", version) - fmt.Fprintf(os.Stdout, "go version %s\n", goversion) + _, err := fmt.Fprintf(os.Stdout, "git-here %s\n", version) + if err != nil { + panic(err) + } + _, err = fmt.Fprintf(os.Stdout, "go version %s\n", goversion) + if err != nil { + panic(err) + } return } diff --git a/syncer/git.go b/syncer/git.go index f6f7319..ba91ad3 100644 --- a/syncer/git.go +++ b/syncer/git.go @@ -25,8 +25,14 @@ func NewGitter(writer, errWriter io.Writer) *Gitter { // IsExist is check git command func (*Gitter) IsExist() error { s, err := exec.LookPath("git") - fmt.Fprintf(os.Stdout, "%s", s) - return err + if err != nil { + return err + } + _, err = fmt.Fprintf(os.Stdout, "%s", s) + if err != nil { + return err + } + return nil } // Git is execute git command diff --git a/syncer/syncer.go b/syncer/syncer.go index a83794f..9b49225 100644 --- a/syncer/syncer.go +++ b/syncer/syncer.go @@ -152,7 +152,7 @@ func (s *Sync) execCmd(ctx context.Context, d string) (err error) { msg, errMsg, err := s.Gitter.Git(s.Command, absPath, s.Options...) if err != nil { - s.Writer.Error(printer.Result{Repo: absPath, Err: errors.Wrapf(err, errMsg)}) + s.Writer.Error(printer.Result{Repo: absPath, Err: errors.Wrapf(err, "%s", errMsg)}) } else { s.Writer.Print(printer.Result{Repo: absPath, Msg: msg}) }