Skip to content

Commit 4638b86

Browse files
authored
Merge pull request #173 from rust-osdev/dev
modernize repository (CI, updates)
2 parents 4078c90 + 2f7e395 commit 4638b86

File tree

10 files changed

+78
-57
lines changed

10 files changed

+78
-57
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ indent_size = 4
1111
trim_trailing_whitespace = true
1212
max_line_length = 80
1313

14-
[{*.nix, *.yml}]
14+
[{*.nix,*.yml}]
1515
indent_size = 2

.github/dependabot.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: cargo
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
ignore:
9+
- dependency-name: "*"
10+
update-types: [ "version-update:semver-patch" ]
11+
- package-ecosystem: cargo
12+
directory: "/integration-test/bins"
13+
schedule:
14+
interval: daily
15+
open-pull-requests-limit: 10
16+
ignore:
17+
- dependency-name: "*"
18+
update-types: [ "version-update:semver-patch" ]
19+
- package-ecosystem: github-actions
20+
directory: "/"
21+
schedule:
22+
interval: daily
23+
open-pull-requests-limit: 10

.github/workflows/_build-rust.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ jobs:
6161
runs-on: ${{ inputs.runs-on }}
6262
steps:
6363
- name: Check out
64-
uses: actions/checkout@v3
65-
- name: Install Rust toolchain
66-
uses: actions-rs/toolchain@v1
64+
uses: actions/checkout@v4
65+
- name: Setup Rust toolchain
66+
uses: dtolnay/rust-toolchain@stable
6767
with:
68-
profile: minimal
6968
toolchain: ${{ inputs.rust-version }}
70-
override: true
69+
targets: ${{ inputs.rust-target }}
7170
components: clippy, rustfmt
72-
target: ${{ inputs.rust-target }}
7371
- name: Set up cargo cache
7472
uses: actions/cache@v3
7573
continue-on-error: false
@@ -94,7 +92,7 @@ jobs:
9492
- name: Code Style and Doc Style
9593
if: inputs.do-style-check
9694
run: |
97-
cargo doc --document-private-items --features ${{ inputs.features }} --no-default-features
95+
cargo doc --no-deps --document-private-items --features ${{ inputs.features }} --no-default-features
9896
cargo clippy --all-targets --features ${{ inputs.features }} --no-default-features
9997
- name: Unit Test (UNIX)
10098
if: inputs.do-test && runner.os != 'Windows'

.github/workflows/integrationtest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# Instead, it is the right thing that the CI always covers the whole repository
77
# and that it is as stable as possible.
88

9-
name: "Cargo workspace"
9+
name: "Integration Test"
1010

1111
# Run on every push (tag, branch) and pull_request
12-
on: [pull_request, push, workflow_dispatch]
12+
on: [pull_request, push, merge_group]
1313

1414
env:
1515
CARGO_TERM_COLOR: always
@@ -21,8 +21,8 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Check out
24-
uses: actions/checkout@v3
25-
- uses: cachix/install-nix-action@v20
24+
uses: actions/checkout@v4
25+
- uses: cachix/install-nix-action@v22
2626
with:
2727
# This channel is only required to invoke "nix-shell".
2828
# Everything inside that nix-shell will use a pinned version of

.github/workflows/qa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: QA
22

3-
on: [ push, pull_request ]
3+
on: [pull_request, push, merge_group]
44

55
jobs:
66
spellcheck:
77
name: Spellcheck
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
# Executes "typos ."
12-
- uses: crate-ci/typos@v1.15.2
12+
- uses: crate-ci/typos@v1.16.2

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
name: "Cargo workspace"
1010

1111
# Run on every push (tag, branch) and pull_request
12-
on: [pull_request, push, workflow_dispatch]
12+
on: [pull_request, push, workflow_dispatch, merge_group]
1313

1414
env:
1515
CARGO_TERM_COLOR: always

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration-test/bins/Cargo.lock

Lines changed: 28 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration-test/bins/multiboot2_chainloader/src/start.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ start:
3636

3737
# Enable SSE.
3838
# Strictly speaking, this is not necessary, but I activated SSE in the
39-
# compiler spec json file. Rustc/LLVM produces SSE coe for example from the
39+
# compiler spec json file. Rustc/LLVM produces SSE code for example from the
4040
# core::fmt code.
4141
mov %cr0, %eax
4242
and $0xFFFB, %ax # clear coprocessor emulation CR0.EM

integration-test/bins/util/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ publish = false
88
[dependencies]
99
good_memory_allocator = "0.1"
1010
log = { version = "0.4", default-features = false }
11-
# Wait for release > 3.0.1
12-
qemu-exit = { git = "https://github.com/rust-embedded/qemu-exit.git", rev = "3cee0efb5c1842b5261850c57b3b4d608542ff03" }
11+
qemu-exit = "3.0.2"

0 commit comments

Comments
 (0)