Skip to content

Commit

Permalink
Merge branch 'main' into clippy-match
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jun 14, 2022
2 parents b909e25 + 2e50ccc commit f97f41a
Show file tree
Hide file tree
Showing 40 changed files with 498 additions and 261 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ After you have the version increments and the updated changelog:
- [ ] Once the PR has been merged, create a new release using the draft release
as a base, by clicking the Edit icon in the [draft
release](https://github.com/ZcashFoundation/zebra/releases).
- [ ] Set the tag name to the version tag, for example: `v1.0.0-alpha.0`
- [ ] Set the release to target the `main` branch
- [ ] Set the release title to `Zebra ` followed by the version tag, for example:
`Zebra 1.0.0-alpha.0`
- [ ] Copy the final changelog of this release to the release description
(starting just _after_ the title `## [Zebra ...`)
- [ ] Set the tag name to the version tag, for example: `v1.0.0-alpha.0`
- [ ] Set the release to target the `main` branch
- [ ] Mark the release as 'pre-release' (until we are no longer alpha/beta)
- [ ] Publish the release

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
mdbook build book/
- name: Deploy Zebra book to firebase
uses: w9jds/firebase-action@v2.1.2
uses: w9jds/firebase-action@v2.2.2
with:
args: deploy
env:
Expand All @@ -63,7 +63,7 @@ jobs:
RUSTDOCFLAGS: '--html-in-header katex-header.html'

- name: Deploy external docs to firebase
uses: w9jds/firebase-action@v2.1.2
uses: w9jds/firebase-action@v2.2.2
with:
args: deploy
env:
Expand All @@ -77,7 +77,7 @@ jobs:
RUSTDOCFLAGS: '--html-in-header katex-header.html'

- name: Deploy internal docs to firebase
uses: w9jds/firebase-action@v2.1.2
uses: w9jds/firebase-action@v2.2.2
with:
args: deploy
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Rust files
id: changed-files-rust
uses: tj-actions/changed-files@v22
uses: tj-actions/changed-files@v23
with:
files: |
**/*.rs
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Workflow files
id: changed-files-workflows
uses: tj-actions/changed-files@v22
uses: tj-actions/changed-files@v23
with:
files: |
.github/workflows/*.yml
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/zcash-lightwalletd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
# rebuild lightwalletd whenever the related Zebra code changes
#
# TODO: this code isn't compiled in this docker image
# rebuild whenever the actual code at zcash/lightwalletd/master changes
# rebuild whenever the actual code at lightwalletd/master changes
- 'zebra-rpc/**'
- 'zebrad/tests/acceptance.rs'
- 'zebrad/src/config.rs'
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
steps:
- uses: actions/checkout@v3.0.2
with:
repository: zcash/lightwalletd
repository: adityapk00/lightwalletd
ref: 'master'
persist-credentials: false

Expand All @@ -73,6 +73,7 @@ jobs:
images: |
${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}
# generate Docker tags based on the following events/attributes
# set latest tag for default branch
tags: |
type=schedule
type=ref,event=branch
Expand All @@ -81,6 +82,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
type=raw,value=latest,enable={{is_default_branch}}
- name: Set up QEMU
id: qemu
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f97f41a

Please sign in to comment.