Skip to content
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

fix(ci): Update to node16 github actions #299

Merged
merged 5 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/aur-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
aur-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Extract crate information
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: wagoid/[email protected]
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
id: toolchain
uses: dtolnay/rust-toolchain@stable

- run: rustup override set ${{steps.toolchain.outputs.name}}

- uses: Swatinem/rust-cache@v2

Expand All @@ -37,13 +37,13 @@ jobs:
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
id: toolchain
uses: dtolnay/rust-toolchain@stable

- run: rustup override set ${{steps.toolchain.outputs.name}}

- name: Build image
run: make images
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt
override: true
id: toolchain
uses: dtolnay/rust-toolchain@stable

- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: rustup component add rustfmt

- run: |
cargo install mdbook --version 0.4.25
Expand Down
52 changes: 27 additions & 25 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install fmt with stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt
override: true
id: toolchain
uses: dtolnay/rust-toolchain@stable

- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: rustup component add rustfmt

- name: Run cargo fmt
run: cargo fmt --all -- --check
Expand All @@ -31,14 +31,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install clippy with stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
override: true
id: toolchain
uses: dtolnay/rust-toolchain@stable

- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: rustup component add clippy

- uses: actions-rs/clippy-check@v1
with:
Expand All @@ -50,20 +50,21 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Extract min supported rust version
shell: bash
run: |
echo "MIN_SUPPORTED_RUST_VERSION=$(sed -n 's/^rust-version = "\(.*\)"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV

- name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
uses: actions-rs/toolchain@v1
id: toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
default: true
components: clippy
profile: minimal

- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: rustup component add clippy

- name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)
uses: actions-rs/cargo@v1
Expand All @@ -87,18 +88,18 @@ jobs:
fail-fast: false
matrix:
job:
# cross minimum glibc version is 2.32
- { os: ubuntu-22.04, target: arm-unknown-linux-gnueabihf, use-cross: true }
- { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu, use-cross: true }
- { os: ubuntu-22.04, target: x86_64-unknown-linux-musl, use-cross: true }
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu, container: quay.io/pypa/manylinux2014_x86_64}
# use ubuntu 20.04 to keep minimum glibc version to 2.31
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu}
- { os: macos-12, target: x86_64-apple-darwin}
name: (${{ matrix.job.os }}) ${{ matrix.job.target }}
runs-on: ${{ matrix.job.os }}
# Use a container with GLIBC 2.17, make build compatible until that version
container: ${{ matrix.job.container }}
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install prerequisites
shell: bash
Expand All @@ -115,11 +116,12 @@ jobs:
key: ${{ matrix.job.target }}

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
id: toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
target: ${{ matrix.job.target }}
override: true
targets: ${{ matrix.job.target }}

- run: rustup override set ${{steps.toolchain.outputs.name}}

- name: Run tests
uses: actions-rs/cargo@v1
Expand Down
3 changes: 1 addition & 2 deletions rash_core/src/modules/find.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ use serde_yaml::Value;
#[cfg(feature = "docs")]
use strum_macros::{Display, EnumString};

#[derive(Debug, PartialEq, Deserialize)]
#[derive(Debug, Default, PartialEq, Deserialize)]
#[cfg_attr(feature = "docs", derive(EnumString, Display, JsonSchema))]
#[serde(rename_all = "lowercase")]
#[derive(Default)]
enum FileType {
Any,
Directory,
Expand Down
Loading