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

horizon: Fix GitHub action problem with verify-range push in master #4253

Merged
merged 5 commits into from
Mar 2, 2022
Merged

horizon: Fix GitHub action problem with verify-range push in master #4253

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33b3d0f
Fix problem with verify-range push in master
2opremio Mar 2, 2022
a521826
Fix pull request refs
2opremio Mar 2, 2022
3f40a0d
Bump all instances of actions/checkout to v3
2opremio Mar 2, 2022
638e3eb
Update .github/workflows/go.yml
2opremio Mar 2, 2022
5193d67
Update .github/workflows/go.yml
2opremio Mar 2, 2022
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
13 changes: 8 additions & 5 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ jobs:
go: [1.17, 1.18.0-rc1]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# For pull requests, build and test the PR head not a merge of the PR with the destination.
ref: ${{ ( github.event.pull_request.head.sha || github.ref }}
2opremio marked this conversation as resolved.
Show resolved Hide resolved
- uses: ./.github/actions/setup-go
with:
go-version: ${{ matrix.go }}
Expand All @@ -31,10 +34,10 @@ jobs:
go: [1.17, 1.16.7, 1.18.0-rc1]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# For pull requests, build and test the PR head not a merge of the PR with the destination.
ref: ${{ github.head_ref || github.ref }}
ref: ${{ ( github.event.pull_request.head.sha || github.ref }}
2opremio marked this conversation as resolved.
Show resolved Hide resolved
- uses: ./.github/actions/setup-go
with:
go-version: ${{ matrix.go }}
Expand Down Expand Up @@ -79,10 +82,10 @@ jobs:
REDIS_HOST: localhost
REDIS_PORT: 6379
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# For pull requests, build and test the PR head not a merge of the PR with the destination.
ref: ${{ github.head_ref || github.ref }}
ref: ${{ github.event.pull_request.head.sha || github.ref }}
# We need to full history for git-restore-mtime to know what modification dates to use.
# Otherwise, the Go test cache will fail (due to the modification time of fixtures changing).
fetch-depth: '0'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/horizon-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Push stellar/horizon:sha to DockerHub
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get image tag (short sha)
shell: bash
Expand All @@ -35,7 +35,7 @@ jobs:
name: Push stellar/ledger-state-diff:{sha,latest} to DockerHub
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Login to DockerHub
uses: docker/login-action@bb984efc561711aaa26e433c32c3521176eae55b
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/horizon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
PGPASSWORD: postgres
PGDATABASE: postgres
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# For pull requests, build and test the PR head not a merge of the PR with the destination.
ref: ${{ github.head_ref || github.ref }}
ref: ${{ github.event.pull_request.head.sha || github.ref }}
# We need to full history for git-restore-mtime to know what modification dates to use.
# Otherwise, the Go test cache will fail (due to the modification time of fixtures changing).
fetch-depth: '0'
Expand Down Expand Up @@ -74,10 +74,10 @@ jobs:
name: Test (and push) verify-range image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# For pull requests, build and test the PR head not a merge of the PR with the destination.
ref: ${{ github.head_ref || github.ref }}
ref: ${{ github.event.pull_request.head.sha || github.ref }}

- name: Build and test the Verify Range Docker image
run: |
Expand All @@ -92,8 +92,8 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- if: github.ref == 'refs/heads/master'
name: Push to DockerHub
# TODO(fons): Commented out until we disable the CircleCI jobs
run: \# docker push stellar/horizon-verify-range:latest
# TODO(fons): Commented out until we disable the CircleCI jobs
# - if: github.ref == 'refs/heads/master'
# name: Push to DockerHub
# run: docker push stellar/horizon-verify-range:latest