Skip to content

Commit 9b9fbeb

Browse files
authored
Merge pull request #477 from circe/to-main
switch to main, better gitignore
2 parents 0afac88 + e1d7708 commit 9b9fbeb

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ jobs:
9696
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
9797

9898
- name: Make target directories
99-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
99+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
100100
run: mkdir -p config/target project/target
101101

102102
- name: Compress target directories
103-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
103+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
104104
run: tar cf targets.tar config/target project/target
105105

106106
- name: Upload target directories
107-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
107+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
108108
uses: actions/upload-artifact@v4
109109
with:
110110
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
@@ -113,7 +113,7 @@ jobs:
113113
publish:
114114
name: Publish Artifacts
115115
needs: [build]
116-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master')
116+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
117117
strategy:
118118
matrix:
119119
os: [ubuntu-22.04]

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
target
22
*.swp
33
.bsp/
4+
.bloop
5+
/.metals/
6+
**/metals.sbt

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ val scala3 = "3.3.6"
1010
ThisBuild / scalaVersion := scala213
1111
ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
1212
ThisBuild / circeRootOfCodeCoverage := Some("root")
13-
ThisBuild / tlCiReleaseBranches := Seq("master")
1413
ThisBuild / tlFatalWarnings := false
1514
ThisBuild / tlMimaPreviousVersions ++= Set(
1615
// manually added because tags are not v-prefixed

0 commit comments

Comments
 (0)