Skip to content

Commit

Permalink
ci: bump codecov (#6638)
Browse files Browse the repository at this point in the history
  • Loading branch information
tac0turtle committed Jul 8, 2020
1 parent 3de1c7d commit e50c8df
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"

split-test-files:
split-test-files:
runs-on: ubuntu-latest
steps:
steps:
- uses: actions/checkout@v2
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
Expand All @@ -26,19 +26,19 @@ jobs:
# cache multiple
- uses: actions/upload-artifact@v2
with:
name: '${{ github.sha }}-aa'
name: "${{ github.sha }}-aa"
path: ./xaa.txt
- uses: actions/upload-artifact@v2
with:
name: '${{ github.sha }}-ab'
with:
name: "${{ github.sha }}-ab"
path: ./xab.txt
- uses: actions/upload-artifact@v2
with:
name: '${{ github.sha }}-ac'
with:
name: "${{ github.sha }}-ac"
path: ./xac.txt
- uses: actions/upload-artifact@v2
with:
name: '${{ github.sha }}-ad'
with:
name: "${{ github.sha }}-ad"
path: ./xad.txt

test-coverage-run-1:
Expand All @@ -53,10 +53,10 @@ jobs:
SUFFIX_FILTER: |
.go
.mod
.sum
.sum
- uses: actions/download-artifact@v2
with:
name: '${{ github.sha }}-aa'
name: "${{ github.sha }}-aa"
if: "env.GIT_DIFF != ''"
- name: test & coverage report creation
run: |
Expand All @@ -73,11 +73,11 @@ jobs:
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: "env.GIT_DIFF != ''"
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v1.0.10
with:
file: ./coverage.txt
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"

test-coverage-run-2:
runs-on: ubuntu-latest
Expand All @@ -91,10 +91,10 @@ jobs:
SUFFIX_FILTER: |
.go
.mod
.sum
.sum
- uses: actions/download-artifact@v2
with:
name: '${{ github.sha }}-ab'
name: "${{ github.sha }}-ab"
if: "env.GIT_DIFF != ''"
- name: test & coverage report creation
run: |
Expand All @@ -111,11 +111,11 @@ jobs:
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: "env.GIT_DIFF != ''"
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v1.0.10
with:
file: ./coverage.txt
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"

test-coverage-run-3:
runs-on: ubuntu-latest
Expand All @@ -129,10 +129,10 @@ jobs:
SUFFIX_FILTER: |
.go
.mod
.sum
.sum
- uses: actions/download-artifact@v2
with:
name: '${{ github.sha }}-ac'
name: "${{ github.sha }}-ac"
if: "env.GIT_DIFF != ''"
- name: test & coverage report creation
run: |
Expand All @@ -149,11 +149,11 @@ jobs:
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: "env.GIT_DIFF != ''"
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v1.0.10
with:
file: ./coverage.txt
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"

test-coverage-run-4:
runs-on: ubuntu-latest
Expand All @@ -167,10 +167,10 @@ jobs:
SUFFIX_FILTER: |
.go
.mod
.sum
.sum
- uses: actions/download-artifact@v2
with:
name: '${{ github.sha }}-ad'
name: "${{ github.sha }}-ad"
if: "env.GIT_DIFF != ''"
- name: test & coverage report creation
run: |
Expand All @@ -187,11 +187,11 @@ jobs:
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: "env.GIT_DIFF != ''"
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v1.0.10
with:
file: ./coverage.txt
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"
fail_ci_if_error: true
if: "env.GIT_DIFF != ''"

integration-tests:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions std/pubkey.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func (cdc DefaultPublicKeyCodec) Decode(key *types.PublicKey) (crypto.PubKey, er
}
var res sr25519.PubKeySr25519
copy(res[:], key.Sr25519)

return res, nil
case *types.PublicKey_Multisig:
pubKeys := key.Multisig.PubKeys
Expand All @@ -55,6 +56,7 @@ func (cdc DefaultPublicKeyCodec) Decode(key *types.PublicKey) (crypto.PubKey, er
}
resKeys[i] = dk
}

return multisig.NewPubKeyMultisigThreshold(int(key.Multisig.K), resKeys), nil
default:
return nil, fmt.Errorf("can't decode PubKey of type %T. Use a custom PublicKeyCodec instead", key)
Expand Down

0 comments on commit e50c8df

Please sign in to comment.