Skip to content

[DON'T MERGE] Test proposed changes in rustls-platform-verifier#104 #3912

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ jobs:
# Do not edit this file in .github/workflows
build-freebsd-master: # job-name skip-stable
runs-on: ubuntu-latest
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-stable
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-stable
steps:
- uses: actions/checkout@v4
with:
Expand Down
6 changes: 2 additions & 4 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ tracing-subscriber = "0.3.16"
url = "2.4"
walkdir = "2"

[patch.crates-io]
rustls-platform-verifier = { git = "https://github.com/rami3l/rustls-platform-verifier.git", branch = "patch-1" }

[lib]
name = "rustup"
path = "src/lib.rs"
Expand Down
2 changes: 1 addition & 1 deletion ci/actions-templates/freebsd-builds-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs: # skip-master skip-stable
build-freebsd-master: # job-name skip-stable
build-freebsd-stable: # job-name skip-master
runs-on: ubuntu-latest
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-stable
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-stable
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-master
steps:
- uses: actions/checkout@v4
Expand Down
Loading