Skip to content

Commit

Permalink
Merge branch 'main' into fix-zip-212-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
oxarbitrage authored Oct 19, 2023
2 parents b1ebd0e + 126b5ad commit 36a8c8f
Show file tree
Hide file tree
Showing 53 changed files with 1,088 additions and 670 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd-deploy-nodes-gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down Expand Up @@ -283,7 +283,7 @@ jobs:
if: github.event_name == 'workflow_dispatch'

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/chore-delete-gcp-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
contents: 'read'
id-token: 'write'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
contents: 'read'
id-token: 'write'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-crates.patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

# Setup Rust with stable toolchain and minimal profile
- name: Setup Rust
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci-build-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: r7kamura/[email protected]

# Setup Rust with stable toolchain and minimal profile
Expand Down Expand Up @@ -99,14 +99,17 @@ jobs:
build:
name: Build ${{ matrix.crate }} crate
timeout-minutes: 90
needs: [ matrix, check-matrix ]
runs-on: ubuntu-latest
strategy:
# avoid rate-limit errors by only launching a few of these jobs at a time
max-parallel: 2
fail-fast: true
matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
runs-on: ubuntu-latest-xl

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
rust: ${{ steps.changed-files-rust.outputs.any_changed == 'true' }}
workflows: ${{ steps.changed-files-workflows.outputs.any_changed == 'true' }}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
fetch-depth: 0

- name: Rust files
id: changed-files-rust
uses: tj-actions/[email protected].1
uses: tj-actions/[email protected].3
with:
files: |
**/*.rs
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Workflow files
id: changed-files-workflows
uses: tj-actions/[email protected].1
uses: tj-actions/[email protected].3
with:
files: |
.github/workflows/*.yml
Expand All @@ -62,7 +62,7 @@ jobs:
if: ${{ needs.changed-files.outputs.rust == 'true' }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
if: ${{ needs.changed-files.outputs.rust == 'true' }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
needs: changed-files
if: ${{ needs.changed-files.outputs.workflows == 'true' }}
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: actionlint
uses: reviewdog/[email protected]
with:
Expand All @@ -155,7 +155,7 @@ jobs:
runs-on: ubuntu-latest
needs: changed-files
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: plettich/action-codespell@master
with:
github_token: ${{ secrets.github_token }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci-unit-tests-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
# TODO: turn this test and the getblocktemplate test into a matrix, so the jobs use exactly the same diagnostics settings
test-all:
name: Test all
timeout-minutes: 180
runs-on: ubuntu-latest-xl
needs: build
steps:
Expand Down Expand Up @@ -144,6 +145,7 @@ jobs:
# (The gRPC feature is a zebrad feature, so it isn't needed here.)
test-fake-activation-heights:
name: Test with fake activation heights
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand All @@ -167,6 +169,7 @@ jobs:
# (We activate the gRPC feature to avoid recompiling `zebrad`, but we don't actually run any gRPC tests.)
test-empty-sync:
name: Test checkpoint sync from empty state
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand All @@ -189,6 +192,7 @@ jobs:
# (We activate the gRPC feature to avoid recompiling `zebrad`, but we don't actually run any gRPC tests.)
test-lightwalletd-integration:
name: Test integration with lightwalletd
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-unit-tests-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
features: " --features getblocktemplate-rpcs"

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand All @@ -231,7 +231,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand All @@ -295,7 +295,7 @@ jobs:

steps:
- name: Checkout git repository
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs-deploy-firebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout the source code
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout the source code
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout the source code
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-dockerhub-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
dockerHubDescription:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-zcashd-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
id-token: 'write'

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-crates-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- uses: r7kamura/[email protected]

- name: Checkout git repository
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sub-build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
contents: 'read'
id-token: 'write'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
persist-credentials: false
- uses: r7kamura/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sub-build-lightwalletd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ jobs:
id-token: 'write'

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
# Note: check service.proto when modifying lightwalletd repo
repository: zcash/lightwalletd
ref: 'master'
persist-credentials: false

- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
path: zebra
persist-credentials: false
Expand Down
Loading

0 comments on commit 36a8c8f

Please sign in to comment.