Skip to content

Commit 4aeb1a7

Browse files
authored
Merge pull request #221 from http4s/update/sbt-http4s-org-2.0.0
Update sbt-http4s-org to 2.0.0
2 parents d691c1c + acad35f commit 4aeb1a7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ jobs:
113113
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' unusedCompileDependenciesTest
114114

115115
- name: Make target directories
116-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
116+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
117117
run: mkdir -p json/.native/target cbor/.js/target json/.jvm/target csv/.jvm/target xml/.jvm/target xml-scala/.js/target xml/.js/target cbor/.native/target xml-scala/.native/target cbor/.jvm/target xml-scala/.jvm/target csv/.native/target csv/.js/target xml/.native/target json/.js/target project/target
118118

119119
- name: Compress target directories
120-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
120+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
121121
run: tar cf targets.tar json/.native/target cbor/.js/target json/.jvm/target csv/.jvm/target xml/.jvm/target xml-scala/.js/target xml/.js/target cbor/.native/target xml-scala/.native/target cbor/.jvm/target xml-scala/.jvm/target csv/.native/target csv/.js/target xml/.native/target json/.js/target project/target
122122

123123
- name: Upload target directories
124-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
124+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
125125
uses: actions/upload-artifact@v4
126126
with:
127127
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
@@ -130,7 +130,7 @@ jobs:
130130
publish:
131131
name: Publish Artifacts
132132
needs: [build]
133-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
133+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
134134
strategy:
135135
matrix:
136136
os: [ubuntu-22.04]

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "1.0.1")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.0")
22

33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
44

0 commit comments

Comments
 (0)