Skip to content

Commit

Permalink
Merge branch 'master' into lighthorizon
Browse files Browse the repository at this point in the history
  • Loading branch information
Shaptic committed Jan 5, 2024
2 parents d3cf7fd + 38f67b9 commit 922c969
Show file tree
Hide file tree
Showing 561 changed files with 80,926 additions and 34,292 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
complete:
if: always()
needs: [check, build, test]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

check:
strategy:
matrix:
os: [ubuntu-latest]
go: [1.19]
os: [ubuntu-22.04]
go: ["1.21"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -37,8 +37,8 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-latest]
go: [1.18, 1.19]
os: [ubuntu-22.04]
go: ["1.20", "1.21"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -49,13 +49,15 @@ jobs:
with:
go-version: ${{ matrix.go }}
- run: go build ./...
- name: Build binaries
run: go run ./support/scripts/build_release_artifacts/main.go

test:
strategy:
matrix:
os: [ubuntu-latest]
go: [1.18, 1.19]
pg: [9.6.5, 10]
os: [ubuntu-22.04]
go: ["1.19", "1.20"]
pg: [12]
runs-on: ${{ matrix.os }}
services:
postgres:
Expand All @@ -80,7 +82,7 @@ jobs:
--health-retries 5
ports:
- 6379:6379
env:
env:
PGHOST: localhost
PGPORT: 5432
PGUSER: postgres
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Linters
on:
push:
branches:
- master
pull_request:

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
pull-requests: read

jobs:
golangci:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # version v3.0.2
with:
fetch-depth: 0 # required for new-from-rev option in .golangci.yml
- name: Setup GO
uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # version v3.3.0
- name: Run golangci-lint
uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc # version v3.2.0
with:
version: v1.52.2 # this is the golangci-lint version
args: --issues-exit-code=0 # exit without errors for now - won't fail the build
github-token: ${{ secrets.GITHUB_TOKEN }}
only-new-issues: true




27 changes: 1 addition & 26 deletions .github/workflows/horizon-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,9 @@ on:

jobs:

push-horizon-image-sha:
name: Push stellar/horizon:sha to DockerHub
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Get image tag (short sha)
shell: bash
id: get_tag
run: echo ::set-output name=TAG::$(git rev-parse --short ${{ github.sha }} )

- name: Login to DockerHub
uses: docker/login-action@bb984efc561711aaa26e433c32c3521176eae55b
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push to DockerHub
uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b
with:
# TODO: Commented out until we disable the CircleCI jobs
# push: true
tags: stellar/horizon:${{ steps.get_tag.outputs.TAG }}
file: services/horizon/docker/Dockerfile.dev

push-state-diff-image:
name: Push stellar/ledger-state-diff:{sha,latest} to DockerHub
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/horizon-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:

publish-artifacts:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Upload artifacts to GitHub release
steps:
- name: Run deprecation tests
Expand All @@ -22,7 +22,7 @@ jobs:

- uses: ./.github/actions/setup-go
with:
go-version: 1.18
go-version: "1.20"

- name: Check dependencies
run: ./gomod.sh
Expand Down
Loading

0 comments on commit 922c969

Please sign in to comment.