Skip to content

Commit 30fac36

Browse files
committed
Move Gradle-only CI jobs
1 parent e7eff3e commit 30fac36

4 files changed

Lines changed: 36 additions & 36 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,41 @@ on:
55
- main
66
pull_request:
77
jobs:
8+
format:
9+
runs-on: ubuntu-latest
10+
name: Formatting
11+
steps:
12+
- uses: actions/checkout@v4
13+
14+
- uses: actions/setup-java@v4
15+
with:
16+
distribution: temurin
17+
java-version: 17
18+
19+
- uses: gradle/actions/setup-gradle@v4
20+
with:
21+
gradle-version: 9.4.1
22+
23+
- run: gradle spotlessCheck --no-daemon
24+
25+
kotlin_plugin:
26+
runs-on: ubuntu-latest
27+
name: scip-kotlinc
28+
steps:
29+
- uses: actions/checkout@v4
30+
31+
- uses: actions/setup-java@v4
32+
with:
33+
distribution: temurin
34+
java-version: 17
35+
36+
- uses: gradle/actions/setup-gradle@v4
37+
with:
38+
gradle-version: 9.4.1
39+
40+
- name: scip-kotlinc tests
41+
run: gradle :scip-kotlinc:test --no-daemon
42+
843
docker_test:
944
runs-on: ubuntu-latest
1045
name: Docker CLI tests

.github/workflows/nix.yaml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,6 @@ jobs:
3131

3232
- run: nix flake check -L
3333

34-
format:
35-
runs-on: ubuntu-latest
36-
name: Formatting
37-
steps:
38-
- uses: actions/checkout@v4
39-
40-
- uses: DeterminateSystems/nix-installer-action@v22
41-
with:
42-
summarize: false
43-
44-
- uses: DeterminateSystems/magic-nix-cache-action@v13
45-
46-
- run: gradle spotlessCheck --no-daemon
47-
4834
test:
4935
runs-on: ubuntu-latest
5036
name: Tests (JDK ${{ matrix.java }})
@@ -121,21 +107,6 @@ jobs:
121107
- run: du -h index.scip
122108
working-directory: examples/bazel-example
123109

124-
kotlin_plugin:
125-
runs-on: ubuntu-latest
126-
name: scip-kotlinc
127-
steps:
128-
- uses: actions/checkout@v4
129-
130-
- uses: DeterminateSystems/nix-installer-action@v22
131-
with:
132-
summarize: false
133-
134-
- uses: DeterminateSystems/magic-nix-cache-action@v13
135-
136-
- name: scip-kotlinc tests
137-
run: gradle :scip-kotlinc:test --no-daemon
138-
139110
snapshots:
140111
runs-on: ubuntu-latest
141112
name: Snapshots

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ These are the main components of the project.
5858
| `gradle :scip-snapshots:saveSnapshots --no-daemon` | terminal | Regenerate Java and Kotlin snapshot goldens. |
5959
| `gradle :scip-java:installDist --no-daemon` | terminal | Build a local `scip-java` distribution under `scip-java/build/install/`. |
6060
| `gradle :scip-java:run --args='--cwd DIRECTORY'` | terminal | Run `scip-java` against a given Gradle/Maven build. |
61-
| `gradle format` | terminal | Format Java and Kotlin sources with Spotless. |
61+
| `gradle spotlessApply` | terminal | Format Java and Kotlin sources with Spotless. |
6262
| `gradle spotlessCheck` | terminal | Check Java and Kotlin formatting. Enforced by GitHub Actions. |
6363

6464
## Import the project into IntelliJ

build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,3 @@ spotless {
2121
ktfmt("0.61").kotlinlangStyle()
2222
}
2323
}
24-
25-
tasks.register("format") {
26-
group = "formatting"
27-
description = "Formats Java and Kotlin sources."
28-
dependsOn("spotlessApply")
29-
}

0 commit comments

Comments
 (0)