Skip to content

Commit 2eb6655

Browse files
committed
Merge branch 'series/0.6.x'
2 parents a290c45 + c12a030 commit 2eb6655

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ jobs:
103103
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
104104

105105
- name: Make target directories
106-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
106+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x')
107107
run: mkdir -p modules/circe/.jvm/target target unidocs/target .js/target modules/core/native/target modules/docs/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/tests/js/target modules/refined/.native/target .jvm/target .native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target modules/tests/jvm/target modules/example/target modules/tests/native/target project/target
108108

109109
- name: Compress target directories
110-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
110+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x')
111111
run: tar cf targets.tar modules/circe/.jvm/target target unidocs/target .js/target modules/core/native/target modules/docs/target modules/core/js/target modules/circe/.js/target modules/core/jvm/target modules/tests/js/target modules/refined/.native/target .jvm/target .native/target modules/refined/.js/target modules/refined/.jvm/target modules/circe/.native/target modules/tests/jvm/target modules/example/target modules/tests/native/target project/target
112112

113113
- name: Upload target directories
114-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
114+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x')
115115
uses: actions/upload-artifact@v3
116116
with:
117117
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
@@ -120,7 +120,7 @@ jobs:
120120
publish:
121121
name: Publish Artifacts
122122
needs: [build]
123-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
123+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x')
124124
strategy:
125125
matrix:
126126
os: [ubuntu-latest]
@@ -344,7 +344,7 @@ jobs:
344344
run: sbt docs/tlSite
345345

346346
- name: Publish site
347-
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
347+
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.6.x'
348348
uses: peaceiris/actions-gh-pages@v3.9.0
349349
with:
350350
github_token: ${{ secrets.GITHUB_TOKEN }}

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ ThisBuild / developers := List(
1313
Developer("tpolecat", "Rob Norris", "rob_norris@mac.com", url("http://www.tpolecat.org"))
1414
)
1515

16-
ThisBuild / tlCiReleaseBranches := Seq("main") // publish snapshits on `main`
16+
ThisBuild / tlCiReleaseBranches += "series/0.6.x"
17+
ThisBuild / tlSitePublishBranch := Some("series/0.6.x")
1718
ThisBuild / tlSonatypeUseLegacyHost := false
1819
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
1920
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
@@ -140,6 +141,7 @@ lazy val refined = crossProject(JVMPlatform, JSPlatform, NativePlatform)
140141
.enablePlugins(AutomateHeaderPlugin)
141142
.settings(commonSettings)
142143
.settings(
144+
name := "skunk-refined",
143145
libraryDependencies ++= Seq(
144146
"eu.timepit" %%% "refined" % "0.10.3",
145147
)

0 commit comments

Comments
 (0)