Skip to content

Commit

Permalink
Update ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Ratakor committed Oct 12, 2023
1 parent cac581d commit 1970ce3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ jobs:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Setup Zig
uses: goto-bus-stop/setup-zig@v2.1.1
uses: goto-bus-stop/setup-zig@v2
with:
version: master

- name: Update submodules
run: git submodule update --init

- name: Install dependencies
run: sudo apt update && sudo apt install -yq xorriso qemu-system-x86

Expand All @@ -43,12 +42,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Zig
uses: goto-bus-stop/setup-zig@v2.1.1
uses: goto-bus-stop/setup-zig@v2
with:
version: master

- name: Lint
run: zig fmt --check kernel/*.zig
run: zig fmt --check kernel/*.zig lib/*.zig
2 changes: 1 addition & 1 deletion build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub fn build(b: *std.Build) void {
run_step.dependOn(&run_cmd.step);

const fmt_step = b.step("fmt", "Format all source files");
fmt_step.dependOn(&b.addFmt(.{ .paths = &[_][]const u8{"kernel"} }).step);
fmt_step.dependOn(&b.addFmt(.{ .paths = &[_][]const u8{ "kernel", "lib" } }).step);

const clean_step = b.step("clean", "Delete all artifacts created by zig build");
clean_step.dependOn(&b.addRemoveDirTree("zig-cache").step);
Expand Down
1 change: 0 additions & 1 deletion lib/term.zig
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ pub const ColorRGB = struct {
}
};


pub inline fn resetColor(writer: anytype) !void {
try writer.writeAll(csi ++ "m");
}
Expand Down

0 comments on commit 1970ce3

Please sign in to comment.