Skip to content

Commit

Permalink
ci: fix super-linter configuration settings (backport #7708) (#7710)
Browse files Browse the repository at this point in the history
* ci: fix super-linter configuration settings (#7708)

- Revert the version pin from #7706.
- Override the YAML linter config to be more forgiving.
- Update YAML lint warnings in a number of files.

The choice of which lints to fix and which to override was ad hoc: I fixed the ones that were mainly whitespace oriented, and suppressed the ones that were document-structure related.

Fixes #7707.

(cherry picked from commit 5eb50a4)

* Resolve cherry-pick conflicts.

Co-authored-by: M. J. Fromberger <[email protected]>
(cherry picked from commit c152462)
  • Loading branch information
mergify[bot] authored and lklimek committed Mar 30, 2022
1 parent b2cb1b4 commit 2d9ecb2
Show file tree
Hide file tree
Showing 29 changed files with 51 additions and 80 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:
8 changes: 0 additions & 8 deletions .github/linter/markdownlint.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/linters/markdownlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
default: true,
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
10 changes: 4 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ name: Docker
# Build & Push rebuilds the Tenderdash docker image every time a release is published
# and pushes the image to https://hub.docker.com/r/dashpay/tenderdash/tags
on:
push:
branches:
- master
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]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
workflow_dispatch:
release:
types:
- published

jobs:
build:
Expand Down
4 changes: 2 additions & 2 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 @@ -59,7 +59,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
6 changes: 3 additions & 3 deletions .github/workflows/e2e-nightly-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

name: e2e-nightly-master
on:
workflow_dispatch: # allow running workflow manually
workflow_dispatch: # allow running workflow manually
schedule:
- cron: '0 2 * * *'

Expand Down Expand Up @@ -57,8 +57,8 @@ jobs:
SLACK_MESSAGE: Nightly E2E tests failed on master
SLACK_FOOTER: ''

e2e-nightly-success: # may turn this off once they seem to pass consistently
needs: e2e-nightly-test-2
e2e-nightly-success: # may turn this off once they seem to pass consistently
needs: e2e-nightly-test
if: ${{ success() }}
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: e2e
# Runs the CI end-to-end test network on all pushes to master or release branches
# and every pull request, but only if any Go files have been changed.
on:
workflow_dispatch: # allow running workflow manually
workflow_dispatch: # allow running workflow manually
pull_request:
push:
branches:
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 Tests
on:
workflow_dispatch: # allow running workflow manually
workflow_dispatch: # allow running workflow manually
schedule:
- cron: '0 3 * * *'
pull_request:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
- name: Checkout Code
uses: actions/[email protected]
- 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
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_MD: true
VALIDATE_OPENAPI: true
VALIDATE_YAML: true
YAML_CONFIG_FILE: yaml-lint.yml
10 changes: 5 additions & 5 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ release:

archives:
- files:
- LICENSE
- README.md
- UPGRADING.md
- SECURITY.md
- CHANGELOG.md
- LICENSE
- README.md
- UPGRADING.md
- SECURITY.md
- CHANGELOG.md
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ networks:
ipam:
driver: default
config:
-
subnet: 192.167.10.0/16
-
subnet: 192.167.10.0/16
7 changes: 2 additions & 5 deletions networks/remote/ansible/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---

#Requires BINARY and CONFIGDIR variables set.
#N=4 hosts by default.

# Requires BINARY and CONFIGDIR variables set.
# N=4 hosts by default.
- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -15,4 +13,3 @@
- config
- unsafe_reset
- start

2 changes: 0 additions & 2 deletions networks/remote/ansible/install.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -8,4 +7,3 @@
- service: tendermint
roles:
- install

5 changes: 1 addition & 4 deletions networks/remote/ansible/logzio.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
---

#Note: You need to add LOGZIO_TOKEN variable with your API key. Like tihs: ansible-playbook -e LOGZIO_TOKEN=ABCXYZ123456

# Note: You need to add LOGZIO_TOKEN variable with your API key. Like tihs: ansible-playbook -e LOGZIO_TOKEN=ABCXYZ123456
- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -11,4 +9,3 @@
- JOURNALBEAT_BINARY: "{{lookup('env', 'GOPATH')}}/bin/journalbeat"
roles:
- logzio

3 changes: 0 additions & 3 deletions networks/remote/ansible/reset.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -10,5 +9,3 @@
- stop
- unsafe_reset
- start


2 changes: 0 additions & 2 deletions networks/remote/ansible/restart.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -9,4 +8,3 @@
roles:
- stop
- start

4 changes: 1 addition & 3 deletions networks/remote/ansible/roles/config/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- name: Copy binary
copy:
src: "{{BINARY}}"
Expand All @@ -13,5 +12,4 @@
dest: "/home/{{service}}/.{{service}}/"
owner: "{{service}}"
group: "{{service}}"
loop: [ 0, 1, 2, 3, 4, 5, 6, 7 ]

loop: [0, 1, 2, 3, 4, 5, 6, 7]
2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/install/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---

- name: reload services
systemd: "name={{service}} daemon_reload=yes enabled=yes"

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/install/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- name: Create service group
group: "name={{service}}"

Expand All @@ -12,4 +11,3 @@
- name: Create service
template: "src=systemd.service.j2 dest=/etc/systemd/system/{{service}}.service"
notify: reload services

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/logzio/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---

- name: reload daemon
command: "systemctl daemon-reload"

- name: restart journalbeat
service: name=journalbeat state=restarted

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/logzio/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- name: Copy journalbeat binary
copy: src="{{JOURNALBEAT_BINARY}}" dest=/usr/bin/journalbeat mode=0755
notify: restart journalbeat
Expand All @@ -24,4 +23,3 @@
notify:
- reload daemon
- restart journalbeat

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/start/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---

- name: start service
service: "name={{service}} state=started"

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/status/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
---

- name: application service status
command: "service {{service}} status"
changed_when: false
register: status

- name: Result
debug: var=status.stdout_lines

2 changes: 0 additions & 2 deletions networks/remote/ansible/roles/stop/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---

- name: stop service
service: "name={{service}} state=stopped"

1 change: 0 additions & 1 deletion networks/remote/ansible/roles/unsafe_reset/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- command: "{{service}} unsafe_reset_all {{ (service != 'tendermint') | ternary('node','') }} --home /home/{{service}}/.{{service}}"
become_user: "{{service}}"
become: yes

2 changes: 0 additions & 2 deletions networks/remote/ansible/start.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -8,4 +7,3 @@
- service: tendermint
roles:
- start

2 changes: 0 additions & 2 deletions networks/remote/ansible/status.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -8,4 +7,3 @@
- service: tendermint
roles:
- status

2 changes: 0 additions & 2 deletions networks/remote/ansible/stop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- hosts: all
user: root
any_errors_fatal: true
Expand All @@ -8,4 +7,3 @@
- service: tendermint
roles:
- stop

0 comments on commit 2d9ecb2

Please sign in to comment.