-
Notifications
You must be signed in to change notification settings - Fork 0
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
Add base for Rust CI #1
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Github config and workflows | ||
|
||
In this folder there is configuration for codecoverage, dependabot, and ci | ||
workflows that check the library more deeply than the default configurations. | ||
|
||
This folder can be or was merged using a --allow-unrelated-histories merge | ||
strategy from <https://github.com/jonhoo/rust-ci-conf/> which provides a | ||
reasonably sensible base for writing your own ci on. By using this strategy | ||
the history of the CI repo is included in your repo, and future updates to | ||
the CI can be merged later. | ||
|
||
To perform this merge run: | ||
|
||
```shell | ||
git remote add ci https://github.com/jonhoo/rust-ci-conf.git | ||
git fetch ci | ||
git merge --allow-unrelated-histories ci/main | ||
``` | ||
|
||
An overview of the files in this project is available at: | ||
<https://www.youtube.com/watch?v=xUH-4y92jPg&t=491s>, which contains some | ||
rationale for decisions and runs through an example of solving minimal version | ||
and OpenSSL issues. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Taken from https://github.com/jonhoo/rust-ci-conf/blob/main/.github/dependabot.yml | ||
|
||
version: 2 | ||
updates: | ||
- package-ecosystem: github-actions | ||
directory: / | ||
schedule: | ||
interval: daily | ||
- package-ecosystem: cargo | ||
directory: / | ||
schedule: | ||
interval: daily | ||
ignore: | ||
- dependency-name: "*" | ||
# patch and minor updates don't matter for libraries as consumers of this library build | ||
# with their own lockfile, rather than the version specified in this library's lockfile | ||
# remove this ignore rule if your package has binaries to ensure that the binaries are | ||
# built with the exact set of dependencies and those are up to date. | ||
update-types: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we want to ignore minor and patches? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't distribute optd as a library now, but we likely will in the future (we want optd to be both a service and an embeddable library) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, but it will start as a service. So we should get notified imo. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually I think it is the other way around right now, we will start as a library and then turn it into a service (we don't want to figure out our entire API immediately and keeping it as a library with a single process keeps it simple) Also, this distinction has nothing to do with if we want to be aware of minor version updates or patches: even if we were to build a binary, we would only really want to know about specific binary dependencies, not the library crate dependencies the binary crate itself would depend on. So that doesn't really make sense for this project. |
||
- "version-update:semver-patch" | ||
- "version-update:semver-minor" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
# Taken from https://github.com/jonhoo/rust-ci-conf/blob/main/.github/workflows/check.yml | ||
|
||
# This workflow runs whenever a PR is opened or updated, or a commit is pushed to main. It runs | ||
# several checks: | ||
# - fmt: checks that the code is formatted according to rustfmt | ||
# - clippy: checks that the code does not contain any clippy warnings | ||
# - doc: checks that the code can be documented without errors | ||
# - hack: check combinations of feature flags | ||
# - msrv: check that the msrv specified in the crate is correct | ||
permissions: | ||
contents: read | ||
# This configuration allows maintainers of this repo to create a branch and pull request based on | ||
# the new branch. Restricting the push trigger to the main branch ensures that the PR only gets | ||
# built once. | ||
on: | ||
push: | ||
branches: [main] | ||
pull_request: | ||
# If new code is pushed to a PR branch, then cancel in progress workflows for that PR. Ensures that | ||
# we don't waste CI time, and returns results quicker https://github.com/jonhoo/rust-ci-conf/pull/5 | ||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | ||
cancel-in-progress: true | ||
name: check | ||
jobs: | ||
fmt: | ||
runs-on: ubuntu-latest | ||
name: stable / fmt | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install stable | ||
uses: dtolnay/rust-toolchain@stable | ||
with: | ||
components: rustfmt | ||
- name: cargo fmt --check | ||
run: cargo fmt --check | ||
clippy: | ||
runs-on: ubuntu-latest | ||
name: ${{ matrix.toolchain }} / clippy | ||
permissions: | ||
contents: read | ||
checks: write | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
# Get early warning of new lints which are regularly introduced in beta channels. | ||
toolchain: [stable, beta] | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install ${{ matrix.toolchain }} | ||
uses: dtolnay/rust-toolchain@master | ||
with: | ||
toolchain: ${{ matrix.toolchain }} | ||
components: clippy | ||
- name: cargo clippy | ||
uses: giraffate/clippy-action@v1 | ||
with: | ||
reporter: 'github-pr-check' | ||
github_token: ${{ secrets.GITHUB_TOKEN }} | ||
# # Since this is not a proper library on crates.io we do not need this. | ||
# semver: | ||
# runs-on: ubuntu-latest | ||
# name: semver | ||
# steps: | ||
# - uses: actions/checkout@v4 | ||
# with: | ||
# submodules: true | ||
# - name: Install stable | ||
# uses: dtolnay/rust-toolchain@stable | ||
# with: | ||
# components: rustfmt | ||
# - name: cargo-semver-checks | ||
# uses: obi1kenobi/cargo-semver-checks-action@v2 | ||
doc: | ||
# run docs generation on nightly rather than stable. This enables features like | ||
# https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an | ||
# API be documented as only available in some specific platforms. | ||
runs-on: ubuntu-latest | ||
name: nightly / doc | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install nightly | ||
uses: dtolnay/rust-toolchain@nightly | ||
- name: Install cargo-docs-rs | ||
uses: dtolnay/install@cargo-docs-rs | ||
- name: cargo docs-rs | ||
# TODO: Once we figure out the crates, rename this. | ||
run: cargo docs-rs -p optd-tmp | ||
hack: | ||
# cargo-hack checks combinations of feature flags to ensure that features are all additive | ||
# which is required for feature unification | ||
runs-on: ubuntu-latest | ||
name: ubuntu / stable / features | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install stable | ||
uses: dtolnay/rust-toolchain@stable | ||
- name: cargo install cargo-hack | ||
uses: taiki-e/install-action@cargo-hack | ||
# intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4 | ||
# --feature-powerset runs for every combination of features | ||
- name: cargo hack | ||
run: cargo hack --feature-powerset check | ||
msrv: | ||
# check that we can build using the minimal rust version that is specified by this crate | ||
runs-on: ubuntu-latest | ||
# we use a matrix here just because env can't be used in job names | ||
# https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability | ||
strategy: | ||
matrix: | ||
msrv: ["1.56.1"] # 2021 edition requires 1.56 | ||
name: ubuntu / ${{ matrix.msrv }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install ${{ matrix.msrv }} | ||
uses: dtolnay/rust-toolchain@master | ||
with: | ||
toolchain: ${{ matrix.msrv }} | ||
- name: cargo +${{ matrix.msrv }} check | ||
run: cargo check |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
# Taken from https://github.com/jonhoo/rust-ci-conf/blob/main/.github/workflows/test.yml | ||
|
||
# This is the main CI workflow that runs the test suite on all pushes to main and all pull requests. | ||
# It runs the following jobs: | ||
# - required: runs the test suite on ubuntu with stable and beta rust toolchains | ||
# - minimal: runs the test suite with the minimal versions of the dependencies that satisfy the | ||
# requirements of this crate, and its dependencies | ||
# - os-check: runs the test suite on mac and windows | ||
# - coverage: runs the test suite and collects coverage information | ||
# See check.yml for information about how the concurrency cancellation and workflow triggering works | ||
permissions: | ||
contents: read | ||
on: | ||
push: | ||
branches: [main] | ||
pull_request: | ||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | ||
cancel-in-progress: true | ||
name: test | ||
jobs: | ||
required: | ||
runs-on: ubuntu-latest | ||
name: ubuntu / ${{ matrix.toolchain }} | ||
strategy: | ||
matrix: | ||
# run on stable and beta to ensure that tests won't break on the next version of the rust | ||
# toolchain | ||
toolchain: [stable, beta] | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install ${{ matrix.toolchain }} | ||
uses: dtolnay/rust-toolchain@master | ||
with: | ||
toolchain: ${{ matrix.toolchain }} | ||
- name: cargo generate-lockfile | ||
# enable this ci template to run regardless of whether the lockfile is checked in or not | ||
if: hashFiles('Cargo.lock') == '' | ||
run: cargo generate-lockfile | ||
# https://twitter.com/jonhoo/status/1571290371124260865 | ||
- name: cargo test --locked | ||
run: cargo test --locked --all-features --all-targets | ||
# https://github.com/rust-lang/cargo/issues/6669 | ||
- name: cargo test --doc | ||
run: cargo test --locked --all-features --doc | ||
minimal: | ||
# This action chooses the oldest version of the dependencies permitted by Cargo.toml to ensure | ||
# that this crate is compatible with the minimal version that this crate and its dependencies | ||
# require. This will pickup issues where this create relies on functionality that was introduced | ||
# later than the actual version specified (e.g., when we choose just a major version, but a | ||
# method was added after this version). | ||
# | ||
# This particular check can be difficult to get to succeed as often transitive dependencies may | ||
# be incorrectly specified (e.g., a dependency specifies 1.0 but really requires 1.1.5). There | ||
# is an alternative flag available -Zdirect-minimal-versions that uses the minimal versions for | ||
# direct dependencies of this crate, while selecting the maximal versions for the transitive | ||
# dependencies. Alternatively, you can add a line in your Cargo.toml to artificially increase | ||
# the minimal dependency, which you do with e.g.: | ||
# ```toml | ||
# # for minimal-versions | ||
# [target.'cfg(any())'.dependencies] | ||
# openssl = { version = "0.10.55", optional = true } # needed to allow foo to build with -Zminimal-versions | ||
# ``` | ||
# The optional = true is necessary in case that dependency isn't otherwise transitively required | ||
# by your library, and the target bit is so that this dependency edge never actually affects | ||
# Cargo build order. See also | ||
# https://github.com/jonhoo/fantoccini/blob/fde336472b712bc7ebf5b4e772023a7ba71b2262/Cargo.toml#L47-L49. | ||
# This action is run on ubuntu with the stable toolchain, as it is not expected to fail | ||
runs-on: ubuntu-latest | ||
name: ubuntu / stable / minimal-versions | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install stable | ||
uses: dtolnay/rust-toolchain@stable | ||
- name: Install nightly for -Zminimal-versions | ||
uses: dtolnay/rust-toolchain@nightly | ||
- name: rustup default stable | ||
run: rustup default stable | ||
- name: cargo update -Zminimal-versions | ||
run: cargo +nightly update -Zminimal-versions | ||
- name: cargo test | ||
run: cargo test --locked --all-features --all-targets | ||
os-check: | ||
# run cargo test on mac and windows | ||
runs-on: ${{ matrix.os }} | ||
name: ${{ matrix.os }} / stable | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [macos-latest, windows-latest] | ||
steps: | ||
# if your project needs OpenSSL, uncomment this to fix Windows builds. | ||
# it's commented out by default as the install command takes 5-10m. | ||
# - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append | ||
# if: runner.os == 'Windows' | ||
# - run: vcpkg install openssl:x64-windows-static-md | ||
# if: runner.os == 'Windows' | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- name: Install stable | ||
uses: dtolnay/rust-toolchain@stable | ||
- name: cargo generate-lockfile | ||
if: hashFiles('Cargo.lock') == '' | ||
run: cargo generate-lockfile | ||
- name: cargo test | ||
run: cargo test --locked --all-features --all-targets | ||
# # TODO: Setup code coverage. | ||
# coverage: | ||
# # use llvm-cov to build and collect coverage and outputs in a format that | ||
# # is compatible with codecov.io | ||
# # | ||
# # note that codecov as of v4 requires that CODECOV_TOKEN from | ||
# # | ||
# # https://app.codecov.io/gh/<user or org>/<project>/settings | ||
# # | ||
# # is set in two places on your repo: | ||
# # | ||
# # - https://github.com/jonhoo/guardian/settings/secrets/actions | ||
# # - https://github.com/jonhoo/guardian/settings/secrets/dependabot | ||
# # | ||
# # (the former is needed for codecov uploads to work with Dependabot PRs) | ||
# # | ||
# # PRs coming from forks of your repo will not have access to the token, but | ||
# # for those, codecov allows uploading coverage reports without a token. | ||
# # it's all a little weird and inconvenient. see | ||
# # | ||
# # https://github.com/codecov/feedback/issues/112 | ||
# # | ||
# # for lots of more discussion | ||
# runs-on: ubuntu-latest | ||
# name: ubuntu / stable / coverage | ||
# steps: | ||
# - uses: actions/checkout@v4 | ||
# with: | ||
# submodules: true | ||
# - name: Install stable | ||
# uses: dtolnay/rust-toolchain@stable | ||
# with: | ||
# components: llvm-tools-preview | ||
# - name: cargo install cargo-llvm-cov | ||
# uses: taiki-e/install-action@cargo-llvm-cov | ||
# - name: cargo generate-lockfile | ||
# if: hashFiles('Cargo.lock') == '' | ||
# run: cargo generate-lockfile | ||
# - name: cargo llvm-cov | ||
# run: cargo llvm-cov --locked --all-features --lcov --output-path lcov.info | ||
# - name: Record Rust version | ||
# run: echo "RUST=$(rustc --version)" >> "$GITHUB_ENV" | ||
# - name: Upload to codecov.io | ||
# uses: codecov/codecov-action@v5 | ||
# with: | ||
# fail_ci_if_error: true | ||
# token: ${{ secrets.CODECOV_TOKEN }} | ||
# env_vars: OS,RUST |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[workspace] | ||
members = ["optd-tmp"] | ||
resolver = "2" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[package] | ||
name = "optd-tmp" | ||
version = "0.1.0" | ||
edition = "2021" | ||
|
||
[dependencies] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
pub fn add(left: u64, right: u64) -> u64 { | ||
left + right | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
|
||
#[test] | ||
fn it_works() { | ||
let result = add(2, 2); | ||
assert_eq!(result, 4); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Daily is too much in the case we remove minor & patches.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The checks are daily but we only receive a notification if something is likely wrong