diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 71175a0..ceff219 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -10,14 +10,6 @@ on: branches: - main -# env variables -env: - CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - # jobs jobs: build: @@ -43,7 +35,7 @@ jobs: #----------- CACHE ----------- - name: Cache SBT - uses: actions/cache@v4 + uses: actions/cache@v4.0.2 with: # A list of files, directories, and wildcard patterns to cache and restore path: | @@ -63,6 +55,8 @@ jobs: #----------- COVERAGE ----------- - name: Upload Coverage to Codacy run: bash <(curl -Ls https://coverage.codacy.com/get.sh) + env: + CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} deploy: runs-on: ubuntu-latest @@ -80,7 +74,7 @@ jobs: #----------- CACHE ----------- - name: Cache SBT - uses: actions/cache@v4 + uses: actions/cache@v4.0.2 with: # A list of files, directories, and wildcard patterns to cache and restore path: | @@ -91,4 +85,9 @@ jobs: #----------- RELEASE ----------- - name: Release - run: sbt clean compile ci-release \ No newline at end of file + run: sbt clean compile ci-release + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} \ No newline at end of file diff --git a/build.sbt b/build.sbt index efb63bd..6b88a5d 100644 --- a/build.sbt +++ b/build.sbt @@ -6,26 +6,25 @@ lazy val org = "com.github.geirolz" lazy val scala33 = "3.3.3" lazy val supportedScalaVersions = List(scala33) +inThisBuild( + List( + homepage := Some(url(s"https://github.com/geirolz/$prjName")), + licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), + developers := List( + Developer( + "DavidGeirola", + "David Geirola", + "david.geirola@gmail.com", + url("https://github.com/geirolz") + ) + ) + ) +) + //## global project to no publish ## val copyReadMe = taskKey[Unit]("Copy generated README to main folder.") lazy val root: Project = project .in(file(".")) - .settings( - inThisBuild( - List( - homepage := Some(url(s"https://github.com/geirolz/$prjName")), - licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - developers := List( - Developer( - "DavidGeirola", - "David Geirola", - "david.geirola@gmail.com", - url("https://github.com/geirolz") - ) - ) - ) - ) - ) .settings(baseSettings) .settings(noPublishSettings) .settings(