Test macos on github actions (e62d4937) · Commits · Public Repositories / Rust Openssl

.circleci/config.yml

+0 −42

Original line number	Diff line number	Diff line
		@@ -158,43 +158,6 @@ jobs:
		- store_artifacts:
		path: /tmp/core_dumps

		macos:
		parameters:
		vendored:
		type: boolean
		default: false
		image:
		type: string
		default: 1.40.0
		macos:
		xcode: "12.2.0"
		environment:
		RUST_BACKTRACE: 1
		steps:
		- checkout
		- run: curl https://sh.rustup.rs -sSf \| sh -s -- -y --default-toolchain << parameters.image >>
		- run: sudo ln -s ~/.cargo/bin/* /usr/local/bin
		- run: cargo generate-lockfile
		- restore_cache:
		key: deps-<< parameters.image >>-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
		- run: \|
		cargo run \
		--manifest-path=systest/Cargo.toml \
		<<# parameters.vendored >> --features vendored <</ parameters.vendored >>
		- run: \|
		cargo test \
		--manifest-path=openssl-errors/Cargo.toml \
		<<# parameters.vendored >> --features openssl-sys/vendored <</ parameters.vendored >>
		- run: \|
		cargo test \
		--manifest-path=openssl/Cargo.toml \
		<<# parameters.vendored >> --features vendored <</ parameters.vendored >>
		- save_cache:
		key: deps-<< parameters.image >>-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
		paths:
		- ~/.cargo/registry/cache
		- target

		openssl_111: &openssl_111
		library: openssl
		version: 1.1.1i
		@@ -284,8 +247,3 @@ workflows:
		target: x86_64-unknown-linux-gnu
		library: libressl
		version: 3.3.1
		- macos:
		name: macos
		- macos:
		name: macos-vendored
		vendored: true

.github/workflows/ci.yml

+33 −10

Original line number	Diff line number	Diff line
		@@ -18,18 +18,15 @@ jobs:
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		- name: Install Rust
		run: rustup update --no-self-update stable && rustup default stable
		- name: Check formatting
		run: cargo fmt --all -- --check
		- uses: sfackler/actions/rustup@master
		- uses: sfackler/actions/rustfmt@master

		clippy:
		name: clippy
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		- name: Install Rust
		run: rustup update --no-self-update stable && rustup default stable
		- uses: sfackler/actions/rustup@master
		- name: Get rust version
		id: rust-version
		run: echo "::set-output name=version::$(rustc --version)"
		@@ -62,8 +59,7 @@ jobs:
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		- name: Install Rust
		run: rustup update --no-self-update 1.36.0 && rustup default 1.36.0
		- uses: sfackler/actions/rustup@master
		- name: Get rust version
		id: rust-version
		run: echo "::set-output name=version::$(rustc --version)"
		@@ -98,8 +94,7 @@ jobs:
		VCPKGRS_DYNAMIC: 1
		steps:
		- uses: actions/checkout@v2
		- name: Install Rust
		run: rustup update --no-self-update stable && rustup default stable
		- uses: sfackler/actions/rustup@master
		- name: Get rust version
		id: rust-version
		run: echo "::set-output name=version::$(rustc --version)"
		@@ -134,3 +129,31 @@ jobs:
		run: cargo test -p openssl
		- name: Test openssl-errors
		run: cargo test -p openssl-errors

		macos-homebrew:
		name: macos-homebrew
		runs-on: macos-latest
		steps:
		- uses: actions/checkout@v2
		- uses: sfackler/actions/rustup@master
		- run: echo "::set-output name=version::$(rustc --version)"
		id: rust-version
		- uses: actions/cache@v1
		with:
		path: ~/.cargo/registry/index
		key: index-${{ runner.os }}-${{ github.run_number }}
		restore-keys: \|
		index-${{ runner.os }}-
		- run: cargo generate-lockfile
		- uses: actions/cache@v1
		with:
		path: ~/.cargo/registry/cache
		key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
		- run: cargo fetch
		- uses: actions/cache@v1
		with:
		path: target
		key: target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
		- run: cargo run -p systest
		- run: cargo test -p openssl
		- run: cargo test -p openssl-errors