Skip to content

Commit

Permalink
Adds rebase to CI build and removes lint. (#510)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChuckCrawford authored Feb 2, 2024
1 parent 184d264 commit 3cefd9a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
9 changes: 7 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
version: 2
version: 2.1

orbs:
git: pagerduty/git@0.1.0

jobs:
build:
docker:
- image: cimg/go:1.17
- image: cimg/go:1.19
steps:
- checkout
- git/rebase_on_main
- run:
name: "Test"
command: make test
Expand Down
4 changes: 2 additions & 2 deletions command/event_orchestration_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"strings"

"github.com/PagerDuty/go-pagerduty"
Expand Down Expand Up @@ -62,7 +62,7 @@ func (c *EventOrchestrationUpdate) Run(args []string) int {
}

log.Info("Input file is:", flags.Arg(0))
f, err := ioutil.ReadFile(flags.Arg(0))
f, err := os.ReadFile(flags.Arg(0))
if err != nil {
log.Error(err)
return -1
Expand Down
6 changes: 1 addition & 5 deletions file_token_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,5 @@ func isSameScope(a, b string) bool {
ta := strings.TrimSpace(a)
tb := strings.TrimSpace(b)

if strings.Compare(ta, tb) == 0 {
return true
}

return false
return strings.Compare(ta, tb) == 0
}

0 comments on commit 3cefd9a

Please sign in to comment.