Skip to content

Commit

Permalink
Just use origin/main
Browse files Browse the repository at this point in the history
  • Loading branch information
varfrog committed Jul 11, 2024
1 parent 18b2da1 commit 59524fc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ issues:
#
# Default: false
new: true
new-from-rev: origin/main
8 changes: 1 addition & 7 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,8 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: stable
- name: Find base branch
id: find_base_branch
run: |
DEFAULT_BRANCH=$(git remote show origin | grep 'HEAD branch' | cut -d' ' -f5)
BASE_BRANCH=$(git merge-base --fork-point origin/$DEFAULT_BRANCH HEAD || echo "origin/$DEFAULT_BRANCH")
echo "BASE_BRANCH=$BASE_BRANCH" >> $GITHUB_ENV
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.59
args: --config .github/.golangci.yml --new-from-rev ${{ env.BASE_BRANCH }}
args: --config .github/.golangci.yml
1 change: 1 addition & 0 deletions mapping_properties_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
)

type MappingPropertiesBuilder struct { //

optionContainer mappingPropertiesBuilderOptionContainer
}

Expand Down

0 comments on commit 59524fc

Please sign in to comment.