-
Notifications
You must be signed in to change notification settings - Fork 300
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #534 from celestiaorg/evan/merge-theirs
Reset to tendermint master
- Loading branch information
Showing
1,072 changed files
with
119,575 additions
and
35,268 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| ## Description | ||
| Please add a description of the changes that this PR introduces and the files that | ||
| are the most critical to review. | ||
|
|
||
| _Please add a description of the changes that this PR introduces and the files that | ||
| are the most critical to review._ | ||
| If this PR fixes an open Issue, please include "Closes #XXX" (where "XXX" is the Issue number) | ||
| so that GitHub will automatically close the Issue when this PR is merged. | ||
|
|
||
| Closes: #XXX | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| name: Build & Push | ||
| # Build & Push rebuilds the tendermint docker image on every push to master and creation of tags | ||
| # and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags | ||
| on: | ||
| pull_request: | ||
| 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 | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/[email protected] | ||
| - name: Prepare | ||
| id: prep | ||
| run: | | ||
| DOCKER_IMAGE=tendermint/tendermint | ||
| VERSION=noop | ||
| if [[ $GITHUB_REF == refs/tags/* ]]; then | ||
| VERSION=${GITHUB_REF#refs/tags/} | ||
| elif [[ $GITHUB_REF == refs/heads/* ]]; then | ||
| VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g') | ||
| if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then | ||
| VERSION=latest | ||
| fi | ||
| fi | ||
| TAGS="${DOCKER_IMAGE}:${VERSION}" | ||
| if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then | ||
| TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}" | ||
| fi | ||
| echo ::set-output name=tags::${TAGS} | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@master | ||
| with: | ||
| platforms: all | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/[email protected] | ||
|
|
||
| - name: Login to DockerHub | ||
| if: ${{ github.event_name != 'pull_request' }} | ||
| uses: docker/[email protected] | ||
| with: | ||
| username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| - name: Publish to Docker Hub | ||
| uses: docker/[email protected] | ||
| with: | ||
| context: . | ||
| file: ./DOCKER/Dockerfile | ||
| platforms: linux/amd64,linux/arm64 | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| tags: ${{ steps.prep.outputs.tags }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,12 @@ | ||
| # Runs randomly generated E2E testnets nightly. | ||
| name: e2e-nightly | ||
| # Runs randomly generated E2E testnets nightly | ||
| # on the 0.34.x release branch | ||
|
|
||
| # !! If you change something in this file, you probably want | ||
| # to update the e2e-nightly-master workflow as well! | ||
|
|
||
| name: e2e-nightly-34x | ||
| on: | ||
| workflow_dispatch: # allow running workflow manually | ||
| workflow_dispatch: # allow running workflow manually, in theory | ||
| schedule: | ||
| - cron: '0 2 * * *' | ||
|
|
||
|
|
@@ -12,15 +17,17 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| group: ['00', '01', '02', '03'] | ||
| group: ['00', '01'] | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 60 | ||
| steps: | ||
| - uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: '1.15' | ||
| go-version: '1.16' | ||
|
|
||
| - uses: actions/checkout@v2 | ||
| - uses: actions/[email protected] | ||
| with: | ||
| ref: 'v0.34.x' | ||
|
|
||
| - name: Build | ||
| working-directory: test/e2e | ||
|
|
@@ -30,7 +37,7 @@ jobs: | |
| - name: Generate testnets | ||
| working-directory: test/e2e | ||
| # When changing -g, also change the matrix groups above | ||
| run: ./build/generator -g 4 -d networks/nightly | ||
| run: ./build/generator -g 2 -d networks/nightly | ||
|
|
||
| - name: Run testnets in group ${{ matrix.group }} | ||
| working-directory: test/e2e | ||
|
|
@@ -45,9 +52,25 @@ jobs: | |
| uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 | ||
| env: | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} | ||
| SLACK_CHANNEL: ci-notfications | ||
| SLACK_CHANNEL: tendermint-internal | ||
| SLACK_USERNAME: Nightly E2E Tests | ||
| SLACK_ICON_EMOJI: ':skull:' | ||
| SLACK_COLOR: danger | ||
| SLACK_MESSAGE: Nightly E2E tests failed | ||
| 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 | ||
| needs: e2e-nightly-test | ||
| if: ${{ success() }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Notify Slack on success | ||
| uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 | ||
| env: | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} | ||
| SLACK_CHANNEL: tendermint-internal | ||
| SLACK_USERNAME: Nightly E2E Tests | ||
| SLACK_ICON_EMOJI: ':white_check_mark:' | ||
| SLACK_COLOR: good | ||
| SLACK_MESSAGE: Nightly E2E tests passed on v0.34.x | ||
| SLACK_FOOTER: '' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| # Runs randomly generated E2E testnets nightly on master | ||
|
|
||
| # !! If you change something in this file, you probably want | ||
| # to update the e2e-nightly-34x workflow as well! | ||
|
|
||
| name: e2e-nightly-master | ||
| on: | ||
| workflow_dispatch: # allow running workflow manually | ||
| schedule: | ||
| - cron: '0 2 * * *' | ||
|
|
||
| jobs: | ||
| e2e-nightly-test-2: | ||
| # Run parallel jobs for the listed testnet groups (must match the | ||
| # ./build/generator -g flag) | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| p2p: ['legacy', 'new', 'hybrid'] | ||
| group: ['00', '01', '02', '03'] | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 60 | ||
| steps: | ||
| - uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: '1.16' | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
||
| - name: Build | ||
| working-directory: test/e2e | ||
| # Run make jobs in parallel, since we can't run steps in parallel. | ||
| run: make -j2 docker generator runner tests | ||
|
|
||
| - name: Generate testnets | ||
| working-directory: test/e2e | ||
| # When changing -g, also change the matrix groups above | ||
| run: ./build/generator -g 4 -d networks/nightly/${{ matrix.p2p }} -p ${{ matrix.p2p }} | ||
|
|
||
| - name: Run ${{ matrix.p2p }} p2p testnets in group ${{ matrix.group }} | ||
| working-directory: test/e2e | ||
| run: ./run-multiple.sh networks/nightly/${{ matrix.p2p }}/*-group${{ matrix.group }}-*.toml | ||
|
|
||
| e2e-nightly-fail-2: | ||
| needs: e2e-nightly-test-2 | ||
| if: ${{ failure() }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Notify Slack on failure | ||
| uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 | ||
| env: | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} | ||
| SLACK_CHANNEL: tendermint-internal | ||
| SLACK_USERNAME: Nightly E2E Tests | ||
| SLACK_ICON_EMOJI: ':skull:' | ||
| SLACK_COLOR: danger | ||
| 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 | ||
| if: ${{ success() }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Notify Slack on success | ||
| uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 | ||
| env: | ||
| SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} | ||
| SLACK_CHANNEL: tendermint-internal | ||
| SLACK_USERNAME: Nightly E2E Tests | ||
| SLACK_ICON_EMOJI: ':white_check_mark:' | ||
| SLACK_COLOR: good | ||
| SLACK_MESSAGE: Nightly E2E tests passed on master | ||
| SLACK_FOOTER: '' |
Oops, something went wrong.