Skip to content

Commit cdfe08b

Browse files
authored
GitHub Actions (#84)
* GitHub Actions * docker dependencies for integration testing * Remove kamon * Final tidy up
1 parent 6bdbb70 commit cdfe08b

File tree

16 files changed

+54
-484
lines changed

16 files changed

+54
-484
lines changed

.github/workflows/publish.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Build and Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*.*
9+
pull_request:
10+
branches:
11+
- master
12+
13+
jobs:
14+
build:
15+
timeout-minutes: 60
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v1
24+
with:
25+
java-version: 17
26+
27+
- name: Cache SBT
28+
uses: actions/cache@v3
29+
with:
30+
path: |
31+
~/.ivy2/cache
32+
~/.sbt
33+
key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
34+
35+
- name: Run the docker-compose integration test dependencies
36+
run: docker-compose up -d
37+
38+
- name: Run tests
39+
run: sbt test it:test
40+
41+
- name: Import GPG key
42+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
43+
uses: crazy-max/ghaction-import-gpg@v6
44+
with:
45+
gpg_private_key: ${{ secrets.GPG_KEY_PRIVATE }}
46+
passphrase: ${{ secrets.GPG_KEY_PASSPHRASE }}
47+
48+
- name: Publish
49+
if: ${{ startsWith(github.ref, 'refs/tags/') }}
50+
run: sbt +publishSigned

.travis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
![Cats Friendly Badge](https://typelevel.org/cats/img/cats-badge-tiny.png)
22

3-
[![Build Status](https://travis-ci.org/ITV/bucky.svg?branch=master)](https://travis-ci.org/ITV/bucky)
4-
[![Join the chat at https://gitter.im/com.itv-bucky/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itv-bucky/Lobby)
5-
63
(under construction: [v1 docs](https://github.com/ITV/bucky/tree/v1.4.5), [v2 docs](https://io.itv.com/bucky/))
74

85
# Migrating to 2.0.0-M28 and above

build.sbt

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ val catsEffectVersion = "3.2.9"
2020
val scalaXmlVersion = "2.0.1"
2121
val scalaz = "7.2.22"
2222
val logbackVersion = "1.2.6"
23-
val kamonVersion = "2.2.3"
2423
val catsEffectScalaTestVersion = "1.3.0"
2524

2625
releaseProcess := Seq[ReleaseStep](
@@ -44,16 +43,10 @@ pomIncludeRepository := { _ =>
4443
}
4544
releasePublishArtifactsAction := PgpKeys.publishSigned.value
4645

47-
pgpPublicRing := file("./ci/public.asc")
48-
49-
pgpSecretRing := file("./ci/private.asc")
50-
51-
pgpSigningKey := Some(-5373332187933973712L)
46+
pgpSigningKey := Some("C2B50980F625F2AF9D3CB3AA5709530EE8FA7576")
5247

5348
pgpPassphrase := Option(System.getenv("GPG_KEY_PASSPHRASE")).map(_.toArray)
5449

55-
useGpg := false
56-
5750
lazy val kernelSettings = Seq(
5851
crossScalaVersions := Seq(scala212, scala213),
5952
scalaVersion := scala212,
@@ -240,29 +233,6 @@ lazy val circe = project
240233
)
241234
)
242235

243-
lazy val kamon = project
244-
.settings(name := "com.itv")
245-
.settings(moduleName := "bucky-kamon")
246-
.settings(kernelSettings: _*)
247-
.dependsOn(core, test % "test,it")
248-
.configs(IntegrationTest)
249-
.settings(Defaults.itSettings)
250-
.settings(
251-
internalDependencyClasspath in IntegrationTest += Attributed.blank((classDirectory in Test).value),
252-
parallelExecution in IntegrationTest := false,
253-
crossScalaVersions := Seq(scala212)
254-
)
255-
.settings(
256-
libraryDependencies ++= Seq(
257-
"com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
258-
"org.scalatest" %% "scalatest" % scalaTestVersion % "test, it",
259-
"org.typelevel" %% "cats-effect-testing-scalatest" % catsEffectScalaTestVersion % "test,it",
260-
"io.kamon" %% "kamon-bundle" % kamonVersion,
261-
"io.kamon" %% "kamon-testkit" % kamonVersion % "test",
262-
"ch.qos.logback" % "logback-classic" % logbackVersion % "test, it"
263-
)
264-
)
265-
266236
lazy val xml = project
267237
.settings(name := "com.itv")
268238
.settings(moduleName := "bucky-xml")
@@ -285,5 +255,5 @@ lazy val xml = project
285255
)
286256

287257
lazy val root = (project in file("."))
288-
.aggregate(xml, circe, kamon, argonaut, example, test, core)
258+
.aggregate(xml, circe, argonaut, example, test, core)
289259
.settings(publishArtifact := false)

ci/private.asc.enc

-4.52 KB
Binary file not shown.

ci/public.asc

Lines changed: 0 additions & 46 deletions
This file was deleted.

ci/publish.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/getting-started.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ libraryDependencies ++= Seq(
1010
"com.itv" %% "bucky-circe" % buckyVersion, //for circe based marshallers/unmarshallers
1111
"com.itv" %% "bucky-argonaut" % buckyVersion, //for argonaut based marhsallers/unmarshallers
1212
"com.itv" %% "bucky-test" % buckyVersion % "test,it" //optional
13-
"com.itv" %% "bucky-kamon" % buckyVersion, //optional
1413
)
1514
```
1615

kamon/src/main/resources/reference.conf

Lines changed: 0 additions & 11 deletions
This file was deleted.

kamon/src/main/scala/com/itv/bucky/kamonSupport/KamonSupport.scala

Lines changed: 0 additions & 127 deletions
This file was deleted.

kamon/src/main/scala/com/itv/bucky/kamonSupport/package.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

kamon/src/test/resources/logback.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)