Fix CI

taig · Nov 20, 2024 · 410ecf3 · 410ecf3
1 parent 5455fc0
commit 410ecf3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -46,24 +46,18 @@ jobs:
     - lint
     - test
     steps:
-      name: Deploy
-      runs-on: ubuntu-latest
-      needs:
-      - lint
-      - test
-      steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Java JDK
-        uses: actions/setup-java@v4
-        with:
-          cache: sbt
-          distribution: temurin
-          java-version: '17'
-      - name: Release
-        run: sbt ci-release
-        env:
-          PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
-          PGP_SECRET: ${{secrets.PGP_SECRET}}
-          SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
-          SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Java JDK
+      uses: actions/setup-java@v4
+      with:
+        cache: sbt
+        distribution: temurin
+        java-version: '17'
+    - name: Release
+      run: sbt ci-release
+      env:
+        PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
+        PGP_SECRET: ${{secrets.PGP_SECRET}}
+        SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
+        SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
diff --git a/.github/workflows/taig.yml b/.github/workflows/taig.yml
@@ -46,24 +46,18 @@ jobs:
     - lint
     - test
     steps:
-      name: Deploy
-      runs-on: ubuntu-latest
-      needs:
-      - lint
-      - test
-      steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Java JDK
-        uses: actions/setup-java@v4
-        with:
-          cache: sbt
-          distribution: temurin
-          java-version: '17'
-      - name: Release
-        run: sbt ci-release
-        env:
-          PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
-          PGP_SECRET: ${{secrets.PGP_SECRET}}
-          SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
-          SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Java JDK
+      uses: actions/setup-java@v4
+      with:
+        cache: sbt
+        distribution: temurin
+        java-version: '17'
+    - name: Release
+      run: sbt ci-release
+      env:
+        PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
+        PGP_SECRET: ${{secrets.PGP_SECRET}}
+        SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
+        SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
diff --git a/project/GitHubActionsGenerator.scala b/project/GitHubActionsGenerator.scala
@@ -87,12 +87,7 @@ object GitHubActionsGenerator {
     "jobs" := Json.obj(
       "lint" := Job.Lint,
       "test" := Job.Test,
-      "deploy" := Json.obj(
-        "name" := "Deploy",
-        "runs-on" := "ubuntu-latest",
-        "needs" := List("lint", "test"),
-        "steps" := Job.Deploy
-      )
+      "deploy" := Job.Deploy
     )
   )
 
@@ -109,12 +104,7 @@ object GitHubActionsGenerator {
     "jobs" := Json.obj(
       "lint" := Job.Lint,
       "test" := Job.Test,
-      "deploy" := Json.obj(
-        "name" := "Deploy",
-        "runs-on" := "ubuntu-latest",
-        "needs" := List("lint", "test"),
-        "steps" := Job.Deploy
-      )
+      "deploy" := Job.Deploy
     )
   )