Skip to content

Commit

Permalink
ci: update workflows to target main branch (#638)
Browse files Browse the repository at this point in the history
* update workflows to target main branch
* update scalafmt native action to use config version
  • Loading branch information
pvlugter authored Feb 10, 2025
1 parent e184d62 commit 36ccbf7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Continuous Integration

on:
pull_request:
branches: [master]
branches: [main]
push:
branches: [master]
branches: [main]
tags: [v*]

env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ jobs:
fetch-depth: 0

- name: Check project is formatted
uses: jrouly/scalafmt-native-action@v1
with:
version: '3.8.3'
# https://github.com/jrouly/scalafmt-native-action/releases
uses: jrouly/scalafmt-native-action@14620cde093e5ff6bfbbecd4f638370024287b9d # v4
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ThisBuild / githubWorkflowJavaVersions := List(
JavaSpec.temurin("11"),
JavaSpec.temurin("17")
)
ThisBuild / githubWorkflowTargetBranches := Seq("master")
ThisBuild / githubWorkflowTargetBranches := Seq("main")
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v")))
ThisBuild / githubWorkflowPublish := Seq(
Expand Down

0 comments on commit 36ccbf7

Please sign in to comment.