Skip to content

Commit

Permalink
Merge branch 'main' into rp/prototype-multi-app
Browse files Browse the repository at this point in the history
  • Loading branch information
rootulp committed Oct 21, 2024
2 parents 28c8edd + 9322d29 commit 9c53da1
Show file tree
Hide file tree
Showing 230 changed files with 8,327 additions and 3,875 deletions.
4 changes: 0 additions & 4 deletions .github/auto_request_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ options:
ignored_keywords:
- DO NOT REVIEW
enable_group_assignment: false

# Randomly pick reviewers up to this number.
# Do not set this option if you'd like to assign all matching reviewers.
number_of_reviewers: 2
16 changes: 16 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,19 @@ pull_request_rules:
backport:
branches:
- v2.x
- name: forward-port patches to main branch (v1.x)
conditions:
- base=v1.x
- label=forwardport:main
actions:
backport:
branches:
- main
- name: forward-port patches to main branch (v2.x)
conditions:
- base=v2.x
- label=forwardport:main
actions:
backport:
branches:
- main
7 changes: 2 additions & 5 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ on:
push:
branches:
- main
- "v[0-9]+.x"
- "v*"
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
- "v*"
pull_request:

jobs:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ name: "CodeQL"

on:
push:
branches: ["main", "v[0-9].[0-9].x", "v[0-9].[0-9][0-9].x", "v[0-9].x"]
branches: ["main", "v*"]
schedule:
- cron: '24 20 * * 4'
- cron: "24 20 * * 4"

jobs:
analyze:
Expand All @@ -25,7 +25,7 @@ jobs:
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
timeout-minutes: 360
permissions:
actions: read
Expand All @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ['go']
language: ["go"]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
Expand All @@ -56,7 +56,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version-file: "go.mod"

- name: Build binary
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release_tracking_epic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
types: [released]
jobs:
trigger_issue:
uses: celestiaorg/.github/.github/workflows/[email protected].3
uses: celestiaorg/.github/.github/workflows/[email protected].5
secrets: inherit
with:
release-repo: ${{ github.repository }}
Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/docker-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,35 @@ on:
push:
branches:
- "main"
- "v[0-9].[0-9].x"
- "v[0-9].[0-9][0-9].x"
- "v[0-9].x"
- "v*"
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
- "v*"
pull_request:
workflow_dispatch:
inputs:
ref:
description: "The checkout reference (ie tag, branch, sha)"
required: true
type: string

jobs:
docker-security-build:
permissions:
contents: write
packages: write
uses: celestiaorg/.github/.github/workflows/[email protected].3
uses: celestiaorg/.github/.github/workflows/[email protected].5
with:
dockerfile: Dockerfile
dockerfile: docker/Dockerfile
checkout_ref: ${{ github.event.inputs.ref }}
secrets: inherit

docker-txsim-build:
permissions:
contents: write
packages: write
uses: celestiaorg/.github/.github/workflows/[email protected].3
uses: celestiaorg/.github/.github/workflows/[email protected].5
with:
dockerfile: docker/Dockerfile_txsim
dockerfile: docker/txsim/Dockerfile
packageName: txsim
checkout_ref: ${{ github.event.inputs.ref }}
secrets: inherit
16 changes: 11 additions & 5 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ jobs:
goreleaser-check:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- uses: goreleaser/goreleaser-action@v6
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: git fetch --force --tags
- uses: actions/setup-go@v5
with:
version: latest
args: check
go-version-file: 'go.mod'
- name: Create .release-env file
run: |-
echo 'GITHUB_TOKEN=${{secrets.GORELEASER_ACCESS_TOKEN}}' >> .release-env
- name: Check the .goreleaser.yaml config file
run: make goreleaser-check

goreleaser:
needs: goreleaser-check
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@ jobs:
**/**.go
go.mod
go.sum
- uses: golangci/[email protected].0
- uses: golangci/[email protected].1
with:
version: v1.59.1
version: v1.61.0
args: --timeout 10m
github-token: ${{ secrets.github_token }}
skip-pkg-cache: true
if: env.GIT_DIFF

# hadolint lints the Dockerfile
hadolint:
uses: celestiaorg/.github/.github/workflows/[email protected]
uses: celestiaorg/.github/.github/workflows/[email protected]
with:
dockerfile: "docker/Dockerfile"

yamllint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: celestiaorg/.github/.github/actions/[email protected].3
- uses: celestiaorg/.github/.github/actions/[email protected].5
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-requester.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
auto-request-review:
name: Auto request reviews
uses: celestiaorg/.github/.github/workflows/[email protected].3
uses: celestiaorg/.github/.github/workflows/[email protected].5
secrets: inherit
# write access for issues and pull requests is needed because the called
# workflow requires write access to issues and pull requests and the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: make test-coverage

- name: Upload coverage.txt
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v4.6.0
with:
file: ./coverage.txt

Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ run:

linters:
enable:
- exportloopref
- copyloopvar
- gofumpt
- misspell
- nakedret
Expand Down
4 changes: 2 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ archives:
checksum:
name_template: "checksums.txt"
snapshot:
name_template: "{{ incpatch .Version }}-next"
version_template: "{{ incpatch .Version }}-next"
changelog:
sort: asc
filters:
Expand All @@ -118,4 +118,4 @@ changelog:
release:
prerelease: auto
git:
prerelease_suffix: "-rc*"
prerelease_suffix: "-"
Loading

0 comments on commit 9c53da1

Please sign in to comment.