diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 399f906..e787c96 100644 --- 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 index d240082..284a783 100644 --- 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 index eeb6ab8..7e9b0f0 100644 --- 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 ) )