Skip to content

Commit 1d6deb4

Browse files
authored
Merge pull request #17 from tofu-tf/ci
do ci
2 parents 46ccb53 + e774c7f commit 1d6deb4

File tree

4 files changed

+72
-11
lines changed

4 files changed

+72
-11
lines changed

.github/workflows/ci.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Continuous Integration
2+
3+
on:
4+
pull_request:
5+
branches: ['master']
6+
push:
7+
branches: ['master']
8+
tags: [v*]
9+
10+
env:
11+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
CI: true
13+
14+
jobs:
15+
build:
16+
name: Build and Test
17+
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
22+
- uses: coursier/cache-action@v6
23+
24+
- uses: actions/setup-java@v4
25+
with:
26+
distribution: temurin
27+
java-version: 22
28+
- uses: sbt/setup-sbt@v1
29+
30+
- name: Build project
31+
run: sbt test
32+
33+
34+
publish:
35+
name: Publish Artifacts
36+
needs: [build]
37+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v3
41+
with:
42+
fetch-depth: 0
43+
44+
- uses: actions/setup-java@v4
45+
with:
46+
distribution: temurin
47+
java-version: 22
48+
- uses: sbt/setup-sbt@v1
49+
50+
- name: coursier-cache
51+
uses: coursier/cache-action@v6
52+
53+
- name: Publish artifacts
54+
env:
55+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
56+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
57+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
58+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
59+
run: sbt ci-release

build.sbt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "volga"
22

3-
val publishVersion = "0.2"
3+
val publishVersion = "0.2.0.1"
44

55
val scala3version = "3.5.2"
66
val scala2version = "2.13.14"
@@ -21,10 +21,10 @@ val modules = file("modules")
2121
val publishSettings = List(
2222
moduleName := { "volga-" + name.value },
2323
publishMavenStyle := true,
24-
homepage := Some(url("https://manatki.org/docs/derevo")),
24+
homepage := Some(url("https://manatki.org/tf-tofu/volga")),
2525
scmInfo := Some(
2626
ScmInfo(
27-
url("https://github.com/manatki/derevo"),
27+
url("https://github.com/tf-tofu/volga"),
2828
"git@github.com:manatki/derevo.git"
2929
)
3030
),
@@ -36,22 +36,21 @@ val publishSettings = List(
3636
url("https://github.com/odomontois")
3737
)
3838
),
39-
organization := "org.manatki",
39+
organization := "tf.tofu",
4040
version := {
4141
val branch = git.gitCurrentBranch.value
4242
if (branch == "master") publishVersion
4343
else s"$publishVersion-$branch-SNAPSHOT"
4444
},
45+
versionScheme := Some("semver-spec"),
4546
licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))
4647
)
4748

4849
val commonSettings = Vector(
4950
scalaVersion := scala3version,
5051
crossScalaVersions := List(scala3version),
5152
scalacOptions ++= Vector(
52-
// "-source",
53-
// "future",
54-
"-Ykind-projector:underscores",
53+
"-Xkind-projector:underscores",
5554
"-Yshow-suppressed-errors",
5655
"-Yexplicit-nulls"
5756
)
@@ -106,3 +105,6 @@ lazy val old = modules / "old"
106105
lazy val oldCore = project.in(old / "core").settings(oldSettings)
107106

108107
lazy val oldMacros = project.in(old / "macros").settings(oldSettings ++ oldMacroDeps).dependsOn(oldCore)
108+
109+
lazy val volga = project.in(file(".")).aggregate(core)
110+

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.10.0
1+
sbt.version = 1.11.2

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
logLevel := Level.Warn
22

3-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
4-
53
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
64

7-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
5+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
6+
7+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")

0 commit comments

Comments
 (0)