Skip to content

Commit

Permalink
chore: fix broken merge in .github
Browse files Browse the repository at this point in the history
  • Loading branch information
MSalopek committed Dec 12, 2023
1 parent 9636447 commit d572073
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ jobs:
needs: newbuild
steps:
- uses: actions/checkout@v4
<<<<<<< HEAD
- uses: actions/setup-go@v4
=======
- uses: actions/setup-go@v5
>>>>>>> main
with:
go-version: 1.21.x
- uses: technote-space/[email protected]
Expand All @@ -62,11 +58,7 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v4
<<<<<<< HEAD
- uses: actions/setup-go@v4
=======
- uses: actions/setup-go@v5
>>>>>>> main
with:
go-version: 1.21.x
- uses: technote-space/get-diff-action@v6
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
<<<<<<< HEAD
- uses: actions/setup-go@v4
=======
- uses: actions/setup-go@v5
>>>>>>> main
with:
go-version: "1.21"
check-latest: true
Expand Down Expand Up @@ -114,11 +110,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
<<<<<<< HEAD
- uses: actions/setup-go@v4
=======
- uses: actions/setup-go@v5
>>>>>>> main
with:
go-version: 1.21.x
- uses: technote-space/[email protected]
Expand Down Expand Up @@ -155,20 +147,9 @@ jobs:
go.sum
- uses: actions/setup-go@v5
with:
<<<<<<< HEAD
<<<<<<< HEAD
go-version: 1.21.x
- name: Install GaiaV10
=======
go-version: 1.20.x
# the old gaiad binary version is hardcoded, need to be updated each major release.
- name: Install Old Gaiad
>>>>>>> main
=======
go-version: 1.20.x
# the old gaiad binary version is hardcoded, need to be updated each major release.
- name: Install Old Gaiad
>>>>>>> main
run: |
git checkout v14.0.0
make build
Expand Down

0 comments on commit d572073

Please sign in to comment.