Skip to content

Commit 0940e81

Browse files
authored
Merge pull request #330 from vasilmkd/release-preparation
Prepare the build for the 1.5.0 release
2 parents f2d981a + d2d5765 commit 0940e81

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ jobs:
9393
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc
9494

9595
- name: Make target directories
96-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
96+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
9797
run: mkdir -p target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target
9898

9999
- name: Compress target directories
100-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
100+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
101101
run: tar cf targets.tar target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target
102102

103103
- name: Upload target directories
104-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
104+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
105105
uses: actions/upload-artifact@v2
106106
with:
107107
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
@@ -110,7 +110,7 @@ jobs:
110110
publish:
111111
name: Publish Artifacts
112112
needs: [build]
113-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
113+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
114114
strategy:
115115
matrix:
116116
os: [ubuntu-latest]

build.sbt

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ThisBuild / startYear := Some(2013)
1212

1313
ThisBuild / tlJdkRelease := Some(8)
1414

15+
ThisBuild / tlSonatypeUseLegacyHost := false
16+
ThisBuild / tlCiReleaseTags := false
17+
1518
lazy val root = tlCrossRootProject
1619
.aggregate(core)
1720
.settings(

0 commit comments

Comments
 (0)