Skip to content

Commit

Permalink
Temporarily use rustsec patch to fix openssl (#67)
Browse files Browse the repository at this point in the history
* Use rustsec patch for vendored-openssl feature
* Disable publish, use musl in self check
  • Loading branch information
Jake-Shadle authored Dec 19, 2019
1 parent 4a6349b commit 3953c5b
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 45 deletions.
99 changes: 58 additions & 41 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,70 +59,87 @@ jobs:

self:
name: Self Check
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest]
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-musl
runs-on: ${{ matrix.os }}
env:
TARGET: x86_64-unknown-linux-musl
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
target: ${{ matrix.target }}
- name: Install musl tools
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get install -y musl-tools
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch
args: --target ${{ matrix.target }}
- name: cargo install
uses: actions-rs/cargo@v1
with:
command: install
# Install in debug mode since this part is sloooooow and
# release doesn't really matter much for runtime
args: --path . --debug
# Also, build and run with musl, this lets us ensure that
# musl still works, which is important for the linux binaries
# we release, but wasn't exercised until now
args: --path . --debug --target ${{ matrix.target }}
- name: self check
uses: actions-rs/cargo@v1
with:
command: deny
args: -L debug check

publish-check:
name: Publish Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch
- name: cargo publish
uses: actions-rs/cargo@v1
with:
command: publish
args: --dry-run
# publish-check:
# name: Publish Check
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# override: true
# - name: cargo fetch
# uses: actions-rs/cargo@v1
# with:
# command: fetch
# - name: cargo publish
# uses: actions-rs/cargo@v1
# with:
# command: publish
# args: --dry-run

publish:
name: Publish
needs: [test, self, publish-check]
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch
- name: cargo publish
uses: actions-rs/cargo@v1
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
with:
command: publish
# publish:
# name: Publish
# needs: [test, self, publish-check]
# runs-on: ubuntu-latest
# if: startsWith(github.ref, 'refs/tags/')
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# override: true
# - name: cargo fetch
# uses: actions-rs/cargo@v1
# with:
# command: fetch
# - name: cargo publish
# uses: actions-rs/cargo@v1
# env:
# CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
# with:
# command: publish

release:
name: Release
Expand Down
16 changes: 13 additions & 3 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ parking_lot = "0.10.0"
petgraph = "0.4.13"
rayon = "1.2.1"
regex = { version = "1.3.1", default-features = true }
rustsec = "0.16.0"
rustsec = { version = "0.16.0", features = ["vendored-openssl"] }
semver = "0.9.0"
serde = { version = "1.0.103", features = ["derive"] }
serde_json = "1.0.44"
Expand All @@ -60,3 +60,6 @@ lazy_static = "1.4.0"
# We use this for creating fake crate directories for
# crawling license files on disk
tempfile = "3.1.0"

[patch.crates-io]
rustsec = { git = "https://github.com/RustSec/rustsec-crate.git", rev = "aaba369" }

0 comments on commit 3953c5b

Please sign in to comment.