Skip to content

Commit

Permalink
ci: replace main/master with 0.34.x in workflow. yml (#172)
Browse files Browse the repository at this point in the history
* Added main/master with 0.34.x

* Making generate .yml the same as in main

* Update mock generation and mock files

* Added enveloper peer

* Fix evidence test

* Fixed failing tests

* super linter fix

* Backporting linter refactorings from main

* fix some superlinter errors

* fixing linter errors

* linter

* Removed k8s

* updated mocks

* Fix yaml files

* renamed workflow file to use main instead of master

* Applied PR comments

* Fixed linter errors
  • Loading branch information
jmalicevic authored Jan 25, 2023
1 parent a23beea commit 6b02109
Show file tree
Hide file tree
Showing 70 changed files with 557 additions and 1,273 deletions.
20 changes: 10 additions & 10 deletions .github/auto-comment.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
pullRequestOpened: |
:wave: Thanks for creating a PR!
:wave: Thanks for creating a PR!
Before we can merge this PR, please make sure that all the following items have been
Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.
write a little note why.
- [ ] Wrote tests
- [ ] Updated CHANGELOG_PENDING.md
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Updated relevant documentation (`docs/`) and code comments
- [ ] Re-reviewed `Files changed` in the Github PR explorer
- [ ] Applied Appropriate Labels
- [ ] Wrote tests
- [ ] Updated CHANGELOG_PENDING.md
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Updated relevant documentation (`docs/`) and code comments
- [ ] Re-reviewed `Files changed` in the Github PR explorer
- [ ] Applied Appropriate Labels
Thank you for your contribution to Tendermint! :rocket:
Thank you for your contribution to Tendermint! :rocket:
15 changes: 15 additions & 0 deletions .github/linters/markdownlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# markdownlint configuration for Super-Linter
# - https://github.com/DavidAnson/markdownlint
# - https://github.com/github/super-linter

# Default state for all rules
default: true

# See https://github.com/DavidAnson/markdownlint#rules--aliases for rules
MD007: {"indent": 4}
MD013: false
MD024: {siblings_only: true}
MD025: false
MD033: {no-inline-html: false}
no-hard-tabs: false
whitespace: false
9 changes: 9 additions & 0 deletions .github/linters/yaml-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
# Default rules for YAML linting from super-linter.
# See: See https://yamllint.readthedocs.io/en/stable/rules.html
extends: default
rules:
document-end: disable
document-start: disable
line-length: disable
truthy: disable
9 changes: 4 additions & 5 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: Check generated code
on:
pull_request:
branches:
- main
- v0.34.x

permissions:
Expand All @@ -16,23 +17,21 @@ jobs:
check-mocks:
runs-on: ubuntu-latest
# TODO (thane): Remove once we make the cometbft-db repository public
env:
env:
GOPRIVATE: github.com/cometbft/cometbft-db
steps:
- uses: actions/setup-go@v3
with:
go-version: '1.18'

- uses: actions/checkout@v3

# TODO (thane): Remove once we make the cometbft-db repository public
- run : git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
- run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
- name: "Check generated mocks"
run: |
set -euo pipefail
readonly MOCKERY=2.12.3 # N.B. no leading "v"
curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
make mockery 2>/dev/null
if ! git diff --stat --exit-code ; then
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cometbft-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- main
- v0.34.x
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
- "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+" # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10
Expand Down Expand Up @@ -60,4 +61,4 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.prep.outputs.tags }}
build-args: |
"GO_MODULES_TOKEN=${{ secrets.GO_MODULES_TOKEN }}"
"GO_MODULES_TOKEN=${{ secrets.GO_MODULES_TOKEN }}"
7 changes: 4 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ on:
pull_request:
push:
branches:
- master
- v0.34.x
- main
- release/**

jobs:
Expand Down Expand Up @@ -43,8 +44,8 @@ jobs:
timeout-minutes: 5
# ToDo (thane): Remove once we make cometbft-db public
env:
GOPRIVATE: github.com/cometbft/cometbft-db
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GOPRIVATE: github.com/cometbft/cometbft-db
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
steps:
- uses: actions/setup-go@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# TODO (thane): Remove once we make the cometbft-db repository public.
- run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/

- name: Build
working-directory: test/e2e
# Run make jobs in parallel, since we can't run steps in parallel.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-nightly-34x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

name: e2e-nightly-34x
on:
workflow_dispatch: # allow running workflow manually, in theory
workflow_dispatch: # allow running workflow manually, in theory
schedule:
- cron: '0 2 * * *'

Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:

# TODO(thane): Remove once we make the cometbft-db repository public
- run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/

- name: Generate testnets
working-directory: test/e2e
# When changing -g, also change the matrix groups above
Expand All @@ -68,7 +68,7 @@ jobs:
SLACK_MESSAGE: Nightly E2E tests failed on v0.34.x
SLACK_FOOTER: ''

e2e-nightly-success: # may turn this off once they seem to pass consistently
e2e-nightly-success: # may turn this off once they seem to pass consistently
needs: e2e-nightly-test
if: ${{ success() }}
runs-on: ubuntu-latest
Expand Down
82 changes: 0 additions & 82 deletions .github/workflows/e2e-nightly-master.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
pull_request:
push:
branches:
- master
- v0.34.x
- main
- release/**

jobs:
Expand All @@ -32,7 +33,6 @@ jobs:
# TODO(thane): Remove once we make the cometbft-db repository public.
- run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/


- name: Build
working-directory: test/e2e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Runs fuzzing nightly.
name: fuzz-nightly
on:
workflow_dispatch: # allow running workflow manually
workflow_dispatch: # allow running workflow manually
schedule:
- cron: '0 3 * * *'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
branches:
- main
- release/**
- v0.34.x

jobs:
govulncheck:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
pull_request:
push:
branches:
- master
- main
- v0.34.x
jobs:
golangci:
name: golangci-lint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Lint
name: Markdown Linter
on:
push:
branches:
- master
- v0.34.x
paths:
- "**.md"
- "**.yml"
- "**.yaml"
pull_request:
branches: [master]
branches: [v0.34.x]
paths:
- "**.md"
- "**.yml"
Expand All @@ -21,12 +21,13 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
- name: Lint Code Base
uses: docker://github/super-linter:v3
uses: docker://github/super-linter:v4
env:
LINTER_RULES_PATH: .
VALIDATE_ALL_CODEBASE: true
DEFAULT_BRANCH: master
DEFAULT_BRANCH: v0.34.x
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_MD: true
VALIDATE_OPENAPI: true
VALIDATE_YAML: true
YAML_CONFIG_FILE: yaml-lint.yml
FILTER_REGEX_EXCLUDE: "/workspace/tools/mintnet-kubernetes/*.yaml | /workspace/tools/mintnet-kubernetes/examples/*.yaml | workspace/tools/mintnet-kubernetes/assets/*.yaml | /workspace/tools/mintnet-kubernetes/examples/dummy/*.yaml | /workspace/tools/mintnet-kubernetes/examples/counter/*.yaml"
4 changes: 2 additions & 2 deletions .github/workflows/proto-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- uses: actions/checkout@v3
- uses: bufbuild/[email protected]
with:
github_token: ${{ secrets.BUF_GITHUB_API_TOKEN }}
buf_api_token: ${{ secrets.BUF_API_TOKEN }}
github_token: ${{ secrets.BUF_GITHUB_API_TOKEN }}
buf_api_token: ${{ secrets.BUF_API_TOKEN }}
- uses: bufbuild/buf-lint-action@v1
with:
input: 'proto'
4 changes: 2 additions & 2 deletions .github/workflows/testapp-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
push:
branches:
- main
- v0.34.x
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
- "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+" # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10
- "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+" # e.g. v0.37.0-beta.1, v0.38.0-beta.10
- "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" # e.g. v0.37.0-rc1, v0.38.0-rc10
# TODO(thane): Remove once we make the cometbft-db repository public.

jobs:
build:
Expand Down Expand Up @@ -61,4 +61,4 @@ jobs:
tags: ${{ steps.prep.outputs.tags }}
# TODO(thane): Remove when we publish cometbft-db repository.
build-args: |
"GO_MODULES_TOKEN=${{ secrets.GO_MODULES_TOKEN }}"
"GO_MODULES_TOKEN=${{ secrets.GO_MODULES_TOKEN }}"
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ on:
pull_request:
push:
branches:
- master
- main
- release/**
- v0.34.x

jobs:
cleanup-runs:
Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 1.0.{build}
configuration: Release
platform:
- x64
- x86
- x64
- x86
clone_folder: c:\go\path\src\github.com\tendermint\tendermint
before_build:
- cmd: set GOPATH=%GOROOT%\path
- cmd: set PATH=%GOPATH%\bin;%PATH%
- cmd: set GOPATH=%GOROOT%\path
- cmd: set PATH=%GOPATH%\bin;%PATH%
build_script:
- cmd: make test
- cmd: make test
test: off
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,4 @@ networks:
ipam:
driver: default
config:
-
subnet: 192.167.10.0/16

- subnet: 192.167.10.0/16
Loading

0 comments on commit 6b02109

Please sign in to comment.