From 3e11e58ae0c984781409f5cd8b706e64ff798aeb Mon Sep 17 00:00:00 2001 From: rami3l Date: Wed, 26 Jun 2024 20:37:48 +0800 Subject: [PATCH 1/2] enable FreeBSD CI --- .github/workflows/ci.yaml | 2 +- ci/actions-templates/freebsd-builds-template.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a1f6593e2a..92ad9eec4b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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: diff --git a/ci/actions-templates/freebsd-builds-template.yaml b/ci/actions-templates/freebsd-builds-template.yaml index 4d6f816cb9..5865512ff1 100644 --- a/ci/actions-templates/freebsd-builds-template.yaml +++ b/ci/actions-templates/freebsd-builds-template.yaml @@ -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 From 67fb64a1f5ecb1febe400a7cf14d472b2f43309c Mon Sep 17 00:00:00 2001 From: rami3l Date: Wed, 26 Jun 2024 20:40:52 +0800 Subject: [PATCH 2/2] patch deps --- Cargo.lock | 6 ++---- Cargo.toml | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1458e723f7..f41125423a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1983,8 +1983,7 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +source = "git+https://github.com/rami3l/rustls-platform-verifier.git?branch=patch-1#0201c0809eeda218cd88da7700c0299ee163f595" dependencies = [ "core-foundation", "core-foundation-sys", @@ -2004,8 +2003,7 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" +source = "git+https://github.com/rami3l/rustls-platform-verifier.git?branch=patch-1#0201c0809eeda218cd88da7700c0299ee163f595" [[package]] name = "rustls-webpki" diff --git a/Cargo.toml b/Cargo.toml index 8c992eb2d5..12f4e9a136 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"