Merge pull request #169 from mdedetrich/make-publish-respect-githubWo…

…rkflowOSes Make publish respect githubWorkflowOSes
sbt · Oct 22, 2023 · 850e842 · 850e842
2 parents 9f00e91 + 7d7bfd2
commit 850e842
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/src/main/scala/sbtghactions/GenerativePlugin.scala b/src/main/scala/sbtghactions/GenerativePlugin.scala
@@ -735,6 +735,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
             githubWorkflowPublish.value.toList :::
             githubWorkflowPublishPostamble.value.toList,
           sbtStepPreamble = githubWorkflowPublishSbtStepPreamble.value.toList,
+          oses = List(githubWorkflowOSes.value.headOption.getOrElse("ubuntu-latest")),
           cond = Some(s"github.event_name != 'pull_request' && $publicationCond"),
           scalas = List(scalaVersion.value),
           javas = List(githubWorkflowJavaVersions.value.head),

diff --git a/...rkflowoses-clean/.github/workflows/ci.yml → ...es-clean-publish/.github/workflows/ci.yml b/...rkflowoses-clean/.github/workflows/ci.yml → ...es-clean-publish/.github/workflows/ci.yml
@@ -75,13 +75,14 @@ jobs:
     if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [windows-latest]
         scala: [2.13.10]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Ignore line ending differences in git
         if: contains(runner.os, 'windows')
+        shell: bash
         run: git config --global core.autocrlf false
 
       - name: Configure pagefile for Windows
@@ -110,6 +111,7 @@ jobs:
           name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
 
       - name: Inflate target directories (2.13.10)
+        shell: bash
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -120,9 +122,11 @@ jobs:
           name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
 
       - name: Inflate target directories (2.12.17)
+        shell: bash
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - name: Publish project
+        shell: bash
         run: sbt +publish
diff --git a/...lowoses-clean/.github/workflows/clean.yml → ...clean-publish/.github/workflows/clean.yml b/...lowoses-clean/.github/workflows/clean.yml → ...clean-publish/.github/workflows/clean.yml
diff --git a/...ctions/githubworkflowoses-clean/build.sbt → ...ithubworkflowoses-clean-publish/build.sbt b/...ctions/githubworkflowoses-clean/build.sbt → ...ithubworkflowoses-clean-publish/build.sbt
diff --git a/...hubworkflowoses-clean/project/plugins.sbt → ...lowoses-clean-publish/project/plugins.sbt b/...hubworkflowoses-clean/project/plugins.sbt → ...lowoses-clean-publish/project/plugins.sbt
diff --git a/...btghactions/githubworkflowoses-clean/test → ...ons/githubworkflowoses-clean-publish/test b/...btghactions/githubworkflowoses-clean/test → ...ons/githubworkflowoses-clean-publish/test