Skip to content

Commit dde0908

Browse files
authored
Merge pull request #11 from unlsycn/master
Bump to mill 0.12.7 and Update CI
2 parents ecb8033 + 0bcf90e commit dde0908

File tree

4 files changed

+38
-9
lines changed

4 files changed

+38
-9
lines changed

.github/workflows/push.yml

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,38 @@
1-
on: [pull_request]
1+
on:
2+
pull_request:
3+
types:
4+
- opened
5+
- synchronize
6+
- reopened
7+
- ready_for_review
8+
- labeled
29
jobs:
3-
checks:
10+
build-and-test:
11+
name: "Build and Test"
412
runs-on: ubuntu-latest
5-
container: archlinux/archlinux:latest
613
steps:
14+
- uses: cachix/install-nix-action@v27
15+
with:
16+
nix_path: nixpkgs=channel:nixos-unstable
717
- name: Install dependencies
8-
run: pacman -Syu --noconfirm make mill z3
9-
- uses: actions/checkout@v2
10-
- name: Check Format
11-
run: make checkformat
18+
run: nix-env -i mill verilator z3 -f '<nixpkgs>'
19+
- uses: actions/checkout@v4
20+
with:
21+
ref: ${{ github.event.pull_request.head.sha }}
1222
- name: Test
1323
run: make test
24+
25+
check-format:
26+
name: "Check Format"
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: cachix/install-nix-action@v27
30+
with:
31+
nix_path: nixpkgs=channel:nixos-unstable
32+
- name: Install dependencies
33+
run: nix-env -i mill -f '<nixpkgs>'
34+
- uses: actions/checkout@v4
35+
with:
36+
ref: ${{ github.event.pull_request.head.sha }}
37+
- name: Test
38+
run: make checkformat

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
!*.cc
1111
!.gitignore
1212
!.scalafmt.conf
13-
!build.sc
1413
!README.md
1514
build/
1615

1716
# mill
17+
!*.mill
18+
!.mill-version
1819
out/
1920
.bsp/
2021
.idea/

.mill-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.12.7

build.sc renamed to build.mill

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package build
2+
13
// import Mill dependency
24
import mill._
35
import mill.define.Sources
@@ -29,7 +31,7 @@ object playground extends ScalaModule with ScalafmtModule { m =>
2931
)
3032
}
3133

32-
def repositoriesTask = T.task {
34+
def repositoriesTask = Task.Anon {
3335
Seq(
3436
coursier.MavenRepository("https://repo.scala-sbt.org/scalasbt/maven-releases"),
3537
coursier.MavenRepository("https://oss.sonatype.org/content/repositories/releases"),

0 commit comments

Comments
 (0)