Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Catches merge conflicts in go.sum files #6640

Closed
wants to merge 16 commits into from
Closed

CI: Catches merge conflicts in go.sum files #6640

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df9c556
add tidy job
anhductn2001 Oct 6, 2023
8992fc6
use tidy-workspace
anhductn2001 Oct 9, 2023
31074be
tidy first
anhductn2001 Oct 9, 2023
ded76a6
add and commit
anhductn2001 Oct 9, 2023
4cb0823
git checkout
anhductn2001 Oct 9, 2023
b817710
test with >>>>>>>
anhductn2001 Oct 9, 2023
e9d13ca
make tidy-workspace
anhductn2001 Oct 9, 2023
dffb4dd
not trigger CI
anhductn2001 Oct 9, 2023
b7858db
test with >>>>>>>
anhductn2001 Oct 9, 2023
0224cef
make tidy-workspace
anhductn2001 Oct 9, 2023
6684342
test with >>>>>>>
anhductn2001 Oct 9, 2023
e26c038
make tidy-workspace
anhductn2001 Oct 9, 2023
823ad21
test with >>>>>>>
anhductn2001 Oct 9, 2023
6661532
make tidy-workspace
anhductn2001 Oct 9, 2023
fda8cdc
test with no changes
anhductn2001 Oct 14, 2023
45aac0a
Update app/ante.go
mattverse Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,20 @@ jobs:
with:
name: osmosisd-${{ matrix.targetos }}-${{ matrix.arch }}
path: cmd/osmosisd/osmosisd
tidy:
runs-on: ubuntu-latest
name: Tidy
steps:
- uses: actions/checkout@v3
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: ${{env.GO_VERSION}}
- run: |
go mod tidy
CHANGES_IN_REPO=$(git status --porcelain)
if [[ -n "$CHANGES_IN_REPO" ]]; then
echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
git status && git --no-pager diff
exit 1
fi