Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main patch tm v0.34.15 #368

Merged
merged 18 commits into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .mergify.yml → .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pull_request_rules:
- name: Automerge to master
- name: Automerge to main
conditions:
- base=master
- base=main
- label=S:automerge
actions:
merge:
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/tests.yml → .github/workflows/abci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Tests
# Tests runs different tests (test_abci_apps, test_abci_cli, test_apps)
# This workflow runs on every push to master or release branch and every pull requests
# Test runs different tests (test_abci_apps, test_abci_cli, test_apps)
# This workflow runs on every push to main or release branch and every pull requests
# All jobs will pass without running if no *{.go, .mod, .sum} files have been modified
on:
pull_request:
Expand All @@ -26,8 +26,8 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
Expand All @@ -36,15 +36,15 @@ jobs:
- name: install
run: make install install_abci
if: "env.GIT_DIFF != ''"
- uses: actions/[email protected].4
- uses: actions/[email protected].7
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
if: env.GIT_DIFF
# Cache binaries for use by other jobs
- uses: actions/[email protected].4
- uses: actions/[email protected].7
with:
path: ~/go/bin
key: ${{ runner.os }}-${{ github.sha }}-oc-binary
Expand All @@ -58,14 +58,14 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: actions/cache@v1
- uses: actions/cache@v2.1.7
id: gobin-cache
with:
path: ~/go/bin
Expand All @@ -87,14 +87,14 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: actions/cache@v1
- uses: actions/cache@v2.1.7
id: gobin-cache
with:
path: ~/go/bin
Expand All @@ -115,14 +115,14 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: actions/cache@v1
- uses: actions/cache@v2.1.7
id: gobin-cache
with:
path: ~/go/bin
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build for Linux
on:
pull_request:
push:

jobs:

build-linux:
name: Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- goarch: "amd64"
gcc: "gcc"
package: ""
host: ""
- goarch: "arm64"
gcc: "aarch64-linux-gnu-gcc"
package: "g++-aarch64-linux-gnu"
host: "aarch64-linux-gnu"
- goarch: "arm"
gcc: "arm-linux-gnueabi-gcc"
package: "g++-arm-linux-gnueabi"
host: "arm-linux-gnueabi"
timeout-minutes: 5
steps:
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
if: "matrix.package != ''"
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/[email protected]
- uses: technote-space/[email protected]
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- name: Build Linux
run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} TARGET_HOST=${{ matrix.host }} make build
if: "env.GIT_DIFF != ''"
- name: Build Linux with Libsodium
run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} TARGET_HOST=${{ matrix.host }} LIBSODIUM=1 make build
if: "env.GIT_DIFF != ''"
76 changes: 26 additions & 50 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
split-test-files:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
- name: Split pkgs into 4 files
run: split -d -n l/4 pkgs.txt pkgs.txt.part.
- name: Split pkgs into 6 files
run: split -d -n l/6 pkgs.txt pkgs.txt.part.
# cache multiple
- uses: actions/upload-artifact@v2
with:
Expand All @@ -29,73 +29,41 @@ jobs:
with:
name: "${{ github.sha }}-03"
path: ./pkgs.txt.part.03
- uses: actions/upload-artifact@v2
with:
name: "${{ github.sha }}-04"
path: ./pkgs.txt.part.04
- uses: actions/upload-artifact@v2
with:
name: "${{ github.sha }}-05"
path: ./pkgs.txt.part.05

build-libsodium:
name: Build libsodium
runs-on: ubuntu-latest
needs: split-test-files
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- run: make libsodium
- uses: actions/upload-artifact@v2
with:
name: libsodium
path: crypto/vrf/internal/vrf/sodium

build-linux:
name: Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- goarch: "amd64"
gcc: "gcc"
package: ""
host: ""
- goarch: "arm64"
gcc: "aarch64-linux-gnu-gcc"
package: "g++-aarch64-linux-gnu"
host: "aarch64-linux-gnu"
- goarch: "arm"
gcc: "arm-linux-gnueabi-gcc"
package: "g++-arm-linux-gnueabi"
host: "arm-linux-gnueabi"
timeout-minutes: 5
steps:
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
if: "matrix.package != ''"
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- name: Build Linux
run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} TARGET_HOST=${{ matrix.host }} make build
if: "env.GIT_DIFF != ''"
- name: Build Linux with Libsodium
run: GOOS=linux GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} TARGET_HOST=${{ matrix.host }} LIBSODIUM=1 make build
if: "env.GIT_DIFF != ''"

tests:
runs-on: ubuntu-latest
needs: build-libsodium
strategy:
fail-fast: false
matrix:
vrf: ["r2ishiguro", "libsodium"]
part: ["00", "01", "02", "03"]
part: ["00", "01", "02", "03", "04", "05"]
steps:
- uses: actions/setup-go@v2
with:
go-version: "^1.15.4"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
Expand All @@ -122,8 +90,8 @@ jobs:
runs-on: ubuntu-latest
needs: tests
steps:
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
Expand All @@ -145,10 +113,18 @@ jobs:
with:
name: "${{ github.sha }}-03-coverage"
if: env.GIT_DIFF
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-04-coverage"
if: env.GIT_DIFF
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-05-coverage"
if: env.GIT_DIFF
- run: |
cat ./*profile.out | grep -v "mode: atomic" >> coverage.txt
if: env.GIT_DIFF
- uses: codecov/codecov-action@v1.0.13
- uses: codecov/codecov-action@v2.1.0
with:
file: ./coverage.txt
if: env.GIT_DIFF
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build-docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2.4.0
- name: Prepare
id: prep
run: |
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
# platforms: all

# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v1
# uses: docker/setup-buildx-action@v1.3.0

# - name: Login to DockerHub
# if: ${{ github.event_name != 'pull_request' }}
Expand All @@ -54,7 +54,7 @@ jobs:
# password: ${{ secrets.DOCKERHUB_TOKEN }}

# - name: Publish to Docker Hub
# uses: docker/build-push-action@v2
# uses: docker/build-push-action@v2.4.0
# with:
# context: .
# file: ./DOCKER/Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
go-version: '^1.15.4'

- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
with:
ref: 'main'

Expand All @@ -46,7 +46,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Notify Slack on failure
# uses: rtCamp/action-slack-notify@e9db0ef
# uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# SLACK_CHANNEL: ostracon-internal
Expand All @@ -62,7 +62,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Notify Slack on success
# uses: rtCamp/action-slack-notify@ae4223259071871559b6e9d08b24a63d71b3f0c0
# uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# SLACK_CHANNEL: ostracon-internal
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: '^1.15.4'
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
go-version: '1.15'

- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0

- name: Install go-fuzz
working-directory: test/fuzz
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Notify Slack if any crashers
# uses: rtCamp/action-slack-notify@ae4223259071871559b6e9d08b24a63d71b3f0c0
# uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
# env:
# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
# SLACK_CHANNEL: ostracon-internal
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linkchecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: gaurav-nelson/[email protected].7
- uses: actions/checkout@v2.4.0
- uses: gaurav-nelson/[email protected].13
with:
folder-path: "docs"
10 changes: 5 additions & 5 deletions .github/workflows/lint.yaml → .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ jobs:
golangci:
name: golangci-lint
runs-on: ubuntu-latest
timeout-minutes: 4
timeout-minutes: 8
steps:
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
- uses: actions/checkout@v2.4.0
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: golangci/[email protected].1
- uses: golangci/[email protected].2
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.38
version: v1.42.1
args: --timeout 10m
github-token: ${{ secrets.github_token }}
if: env.GIT_DIFF
Loading