-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into db-forward-compat
- Loading branch information
Showing
13 changed files
with
73 additions
and
35 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,10 +112,10 @@ jobs: | |
- uses: r7kamura/[email protected] | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
# Setup Rust with stable toolchain and minimal profile | ||
|
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 |
---|---|---|
|
@@ -69,7 +69,8 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
# TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 | ||
os: [ubuntu-latest, macos-latest] | ||
# TODO: macOS tests were removed for now, see https://github.com/ZcashFoundation/zebra/issues/6824 | ||
os: [ubuntu-latest] | ||
rust: [stable, beta] | ||
features: ["", " --features getblocktemplate-rpcs"] | ||
exclude: | ||
|
@@ -94,10 +95,10 @@ jobs: | |
- uses: r7kamura/[email protected] | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
# Setup Rust with ${{ matrix.rust }} toolchain and minimal profile | ||
|
@@ -230,10 +231,10 @@ jobs: | |
- uses: r7kamura/[email protected] | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
# Setup Rust with stable toolchain and minimal profile | ||
|
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 |
---|---|---|
|
@@ -67,10 +67,10 @@ jobs: | |
persist-credentials: false | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Check workflow permissions | ||
|
@@ -118,10 +118,10 @@ jobs: | |
- uses: r7kamura/[email protected] | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
# Setup Rust with stable toolchain and default profile | ||
|
@@ -157,10 +157,10 @@ jobs: | |
- uses: r7kamura/[email protected] | ||
|
||
- name: Install last version of Protoc | ||
uses: arduino/setup-protoc@v1.3.0 | ||
uses: arduino/setup-protoc@v2.0.0 | ||
with: | ||
# TODO: increase to latest version after https://github.com/arduino/setup-protoc/issues/33 is fixed | ||
version: '3.20.1' | ||
version: '23.x' | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
# Setup Rust with stable toolchain and default profile | ||
|
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
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