Skip to content

Commit

Permalink
patch samael crate to include njaremko/samael#41 (#5023)
Browse files Browse the repository at this point in the history
Points cargo at
https://github.com/oxidecomputer/samael/tree/oxide/omicron, which has
njaremko/samael#41 merged in.

Fixes #4920, reverts #5007, supersedes #5019.
  • Loading branch information
iliana authored Feb 8, 2024
1 parent 00d8024 commit bdf9a22
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ jobs:
- name: Disable packages.microsoft.com repo
if: ${{ startsWith(matrix.os, 'ubuntu') }}
run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
# https://github.com/oxidecomputer/omicron/issues/4920
- name: Pin libxmlsec1 to 1.3.2
if: ${{ startsWith(matrix.os, 'macos') }}
run: |
curl -fLOsS --retry 5 https://raw.githubusercontent.com/Homebrew/homebrew-core/081149b0d2720c2759b6ac8253e33b27f6d6c1cd/Formula/lib/libxmlsec1.rb
brew install ./libxmlsec1.rb
brew pin libxmlsec1
rm -f libxmlsec1.rb
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.event.pull_request.head.sha }} # see omicron#4461
Expand Down
3 changes: 1 addition & 2 deletions Cargo.lock

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

5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -614,3 +614,8 @@ branch = "oxide/omicron"
# to it.
[patch.crates-io.omicron-workspace-hack]
path = "workspace-hack"

# Pulls in https://github.com/njaremko/samael/pull/41
[patch.crates-io.samael]
git = "https://github.com/oxidecomputer/samael"
branch = "oxide/omicron"

0 comments on commit bdf9a22

Please sign in to comment.