Skip to content

modernize repository (CI, updates) #173

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

Merged
merged 7 commits into from
Sep 21, 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 .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ indent_size = 4
trim_trailing_whitespace = true
max_line_length = 80

[{*.nix, *.yml}]
[{*.nix,*.yml}]
indent_size = 2
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: "*"
update-types: [ "version-update:semver-patch" ]
- package-ecosystem: cargo
directory: "/integration-test/bins"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: "*"
update-types: [ "version-update:semver-patch" ]
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
12 changes: 5 additions & 7 deletions .github/workflows/_build-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,13 @@ jobs:
runs-on: ${{ inputs.runs-on }}
steps:
- name: Check out
uses: actions/checkout@v3
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: ${{ inputs.rust-version }}
override: true
targets: ${{ inputs.rust-target }}
components: clippy, rustfmt
target: ${{ inputs.rust-target }}
- name: Set up cargo cache
uses: actions/cache@v3
continue-on-error: false
Expand All @@ -94,7 +92,7 @@ jobs:
- name: Code Style and Doc Style
if: inputs.do-style-check
run: |
cargo doc --document-private-items --features ${{ inputs.features }} --no-default-features
cargo doc --no-deps --document-private-items --features ${{ inputs.features }} --no-default-features
cargo clippy --all-targets --features ${{ inputs.features }} --no-default-features
- name: Unit Test (UNIX)
if: inputs.do-test && runner.os != 'Windows'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# Instead, it is the right thing that the CI always covers the whole repository
# and that it is as stable as possible.

name: "Cargo workspace"
name: "Integration Test"

# Run on every push (tag, branch) and pull_request
on: [pull_request, push, workflow_dispatch]
on: [pull_request, push, merge_group]

env:
CARGO_TERM_COLOR: always
Expand All @@ -21,8 +21,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
uses: actions/checkout@v4
- uses: cachix/install-nix-action@v22
with:
# This channel is only required to invoke "nix-shell".
# Everything inside that nix-shell will use a pinned version of
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/qa.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: QA

on: [ push, pull_request ]
on: [pull_request, push, merge_group]

jobs:
spellcheck:
name: Spellcheck
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Executes "typos ."
- uses: crate-ci/typos@v1.15.2
- uses: crate-ci/typos@v1.16.2
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
name: "Cargo workspace"

# Run on every push (tag, branch) and pull_request
on: [pull_request, push, workflow_dispatch]
on: [pull_request, push, workflow_dispatch, merge_group]

env:
CARGO_TERM_COLOR: always
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

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

55 changes: 28 additions & 27 deletions integration-test/bins/Cargo.lock

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

2 changes: 1 addition & 1 deletion integration-test/bins/multiboot2_chainloader/src/start.S
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ start:

# Enable SSE.
# Strictly speaking, this is not necessary, but I activated SSE in the
# compiler spec json file. Rustc/LLVM produces SSE coe for example from the
# compiler spec json file. Rustc/LLVM produces SSE code for example from the
# core::fmt code.
mov %cr0, %eax
and $0xFFFB, %ax # clear coprocessor emulation CR0.EM
Expand Down
3 changes: 1 addition & 2 deletions integration-test/bins/util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ publish = false
[dependencies]
good_memory_allocator = "0.1"
log = { version = "0.4", default-features = false }
# Wait for release > 3.0.1
qemu-exit = { git = "https://github.com/rust-embedded/qemu-exit.git", rev = "3cee0efb5c1842b5261850c57b3b4d608542ff03" }
qemu-exit = "3.0.2"