From cdb3c92234bffd48c4bced776038ca9708510456 Mon Sep 17 00:00:00 2001 From: Anton Troshin Date: Tue, 27 Apr 2021 19:20:31 +0300 Subject: [PATCH 1/3] Move to Github Actions and Sonatype --- .github/workflows/ci.yml | 114 ++++++++++++++++++++++++++++++++++++ .github/workflows/clean.yml | 59 +++++++++++++++++++ .gitignore | 4 ++ .travis.yml | 35 ----------- README.md | 5 +- build.sbt | 19 ++++-- project/build.properties | 2 +- project/plugins.sbt | 6 +- travis/secrets.tar.enc | Bin 8208 -> 0 bytes 9 files changed, 198 insertions(+), 46 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/clean.yml delete mode 100644 .travis.yml delete mode 100644 travis/secrets.tar.enc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2380d18 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,114 @@ +# This file was automatically generated by sbt-github-actions using the +# githubWorkflowGenerate task. You should add and commit this file to +# your git repository. It goes without saying that you shouldn't edit +# this file by hand! Instead, if you wish to make changes, you should +# change your sbt build configuration to revise the workflow description +# to meet your needs, then regenerate this file. + +name: Continuous Integration + +on: + pull_request: + branches: ['*'] + push: + branches: ['*'] + tags: [v*] + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +jobs: + build: + name: Build and Test + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.12.13] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Setup Java and Scala + uses: olafurpg/setup-scala@v10 + with: + java-version: ${{ matrix.java }} + + - name: Cache sbt + uses: actions/cache@v2 + with: + path: | + ~/.sbt + ~/.ivy2/cache + ~/.coursier/cache/v1 + ~/.cache/coursier/v1 + ~/AppData/Local/Coursier/Cache/v1 + ~/Library/Caches/Coursier/v1 + key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + + - name: Check that workflows are up to date + run: sbt ++${{ matrix.scala }} githubWorkflowCheck + + - run: sbt ++${{ matrix.scala }} test scripted + + - name: Compress target directories + run: tar cf targets.tar target project/target + + - name: Upload target directories + uses: actions/upload-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} + path: targets.tar + + publish: + name: Publish Artifacts + needs: [build] + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.12.13] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Setup Java and Scala + uses: olafurpg/setup-scala@v10 + with: + java-version: ${{ matrix.java }} + + - name: Cache sbt + uses: actions/cache@v2 + with: + path: | + ~/.sbt + ~/.ivy2/cache + ~/.coursier/cache/v1 + ~/.cache/coursier/v1 + ~/AppData/Local/Coursier/Cache/v1 + ~/Library/Caches/Coursier/v1 + key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + + - name: Download target directories (2.12.13) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }} + + - name: Inflate target directories (2.12.13) + run: | + tar xf targets.tar + rm targets.tar + + - env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + run: sbt ++${{ matrix.scala }} ci-release \ No newline at end of file diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml new file mode 100644 index 0000000..b535fcc --- /dev/null +++ b/.github/workflows/clean.yml @@ -0,0 +1,59 @@ +# This file was automatically generated by sbt-github-actions using the +# githubWorkflowGenerate task. You should add and commit this file to +# your git repository. It goes without saying that you shouldn't edit +# this file by hand! Instead, if you wish to make changes, you should +# change your sbt build configuration to revise the workflow description +# to meet your needs, then regenerate this file. + +name: Clean + +on: push + +jobs: + delete-artifacts: + name: Delete Artifacts + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Delete artifacts + run: | + # Customize those three lines with your repository and credentials: + REPO=${GITHUB_API_URL}/repos/${{ github.repository }} + + # A shortcut to call GitHub API. + ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } + + # A temporary file which receives HTTP response headers. + TMPFILE=/tmp/tmp.$$ + + # An associative array, key: artifact name, value: number of artifacts of that name. + declare -A ARTCOUNT + + # Process all artifacts on this repository, loop on returned "pages". + URL=$REPO/actions/artifacts + while [[ -n "$URL" ]]; do + + # Get current page, get response headers in a temporary file. + JSON=$(ghapi --dump-header $TMPFILE "$URL") + + # Get URL of next page. Will be empty if we are at the last page. + URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*.*//') + rm -f $TMPFILE + + # Number of artifacts on this page: + COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') )) + + # Loop on all artifacts on this page. + for ((i=0; $i < $COUNT; i++)); do + + # Get name of artifact and count instances of this name. + name=$(jq <<<$JSON -r ".artifacts[$i].name?") + ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1)) + + id=$(jq <<<$JSON -r ".artifacts[$i].id?") + size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") )) + printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size + ghapi -X DELETE $REPO/actions/artifacts/$id + done + done \ No newline at end of file diff --git a/.gitignore b/.gitignore index daf52df..a171c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,10 @@ lib_managed/ src_managed/ project/boot/ project/plugins/project/ +.bloop +/.bsp +.metals +metals.sbt # Scala-IDE specific .scala_dependencies diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 25c070c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -sudo: false -language: scala -scala: - - 2.12.2 -jdk: - - openjdk8 - -stages: - - name: build - - name: publish - if: tag IS present - -jobs: - include: - - stage: build - script: sbt ++$TRAVIS_SCALA_VERSION scripted - - stage: publish - script: sbt ++$TRAVIS_SCALA_VERSION releaseEarly; - -before_install: - - if [ $TRAVIS_PULL_REQUEST = 'false' ]; then - openssl aes-256-cbc -K $encrypted_7edee92045c5_key -iv $encrypted_7edee92045c5_iv -in travis/secrets.tar.enc -out travis/secrets.tar -d; - tar xv -C travis -f travis/secrets.tar; - fi -env: - global: - - secure: "dX0/0svIVfDh7Ush3m+ryNmLO3RJJGHr2d6E6hZjPYqwdH4cjkeov1Va+hs6KGz3rAG8DqbweQ7RR+S1IoEg257y+v7t64eKFm0w9rYWV0jbvhTi7xdaU5SVrevQ7HqEr9/mNd35VFYbZ14VPBM5Pm1y9SWmlO6qvbbu9MLxurVqq/z2YUdHKrFW8mZh8n/PEZCmc+I/gTWNWrPsl7UuQ9+R/vAEkwIsU/DuP5BdH70vYVQsgyry+ZQyyyEFtETFEWdP3kR63d1Ws0+ACse2v8vYKaL7lRdo+YgdFxOY1d4qjQ8P6H+MR3TjejJzuZDCA42NJh9y48iWZUxWNwJb5WBH2cL3RPjZURGSFEnjIjxTF7Ser08Xu7OpJ8rj4vLGyF9ovcDDaA7FDvTrgE3cORuxsuZFEjo7PLvs8OjgWZ866wQVVD38yCODQa+dmg2+aN1kXoiVBH6q28GWT6cNM43zk2/jlNKwv8IvDanBlGQ5SuHKdTJ1NBl8ojmwaITBZkmUNqSwSER8fjXT92S5X+JXSEClN13odDfic9zEHggDTsdkXoAdkcFL3TFbxahEqkD5KHOtsNN5jKo34GcLPMft/cc/0aLcsKuEhydR10kBWQqfIIT0fbsOKntI1MFGd3JFyY1xu0hDMd+tRh8td7YqZs+JSZ2Be+f+8FkTY7Y=" - - secure: "Aua13r2PxTgpH21uhYtf7/ZfHBGI2mkHUAJWmpZ91PKKiuy4J/hkoZOHJOCjegFLAX4U9JWDmxbyMc+te094kOi4DKPIIvebKccjuqZRQD69/qcOZcERJKIoVaWjXBmXD9S0s6FBvSD1JPSujJ5S7MszOk6ilhoPSlvry3jvyAjX5w6hW6jZLysT1/ilsghdJCAFiqhskTwvIMWpUxh57THqwLAv45G17eeP2ruDRO2gZkgujaxXZBtiez4dIIrPgvg6jsSVJ46RGu539wyjQbAWaWYlCWboSrBcAChFLBKrSqGFOYD5w8PfFVSYvsKoHt/eeY9/xMbSxlGgAuC6w2LrRQGOz0PNqGeweYU4u8bMC0l58E+KhYuE30YFKGug+oua+c+9fT+WMdT0U5SdkOoVxF0MVZIZ7lGNTUZP52bTlko9NSKBPv3lNHuUPEbwPPD8sECmz39Kld9LyOSdHNsJ6GL0/jShQbUrdIOV28zF3OKZUPBq9pOcDPVhuzYNfM5FU0JaCrO5180ExqDXe6A33lAB0Nwaxx7zbR+rkBz0lTDISHGqachdskpCHQQpmL7C1BYxvYFivI1B1Ac/rk/bUE6CY2Vb5ggMJfa4Q05ioV1onj6d2r2POqq3Jbb5AU662DVGn+4n2cWxssi0tDzQR4iSFbv9DkNfmdp8ESQ=" - - secure: "ZwGuIqO7zQG7sW3FMp0is6v2H6kWuNjLmgL1qyL/mDCXQChOqj8qTAs8PBd6Lv+v5iA/GJMmZmcR4gsTaielRJk8HpmW013ZWUrJVHcLKAiUQ47b0m5vzVWDavoQqPif6ZlFMEwiUYR0Oz7mvo7pC6pKcUfiC6wTsfaMN6+4ArvULbjeA1W9/G78qIGoqiTlWfmtu8dBXZ3QlaoCbxhyHTxxAl1oFOBzxR6L8AQ7q9kCMCukDIzYt/gnmbyDr8lzakNQ/gwjWIQr/q0ZlbNOZZNtWxAhIVi/im/dLuZwNNLAVjkgUvkAghqGY/3hhylZ9WdzTw1e4IRTAg4gtKNvffJ/+XWOKv4S3hgd9SwmI89idzbFqi503k6YRDscv8nVodIr22u6bqKJNLmKBhZZ9Er5v2TmORCm7/cuywhaXOr0HFwjy6zkRI/pm73jIJl+9mYR9NcFgopSZLgl4ZH9yr+01o6HAKGIEz1/kgwN1YR0HQRtTUSTy2I0R6zaBaQVSI1RKdfeFh/zxPvIlgmml+7eMyQparxUcd5trAmM9V1jU49udI8XN9QZbYbvO3XrbyfFQLCZ6KU9ZiB5YNXDjLHDYkLItn89meznaojpUxCu1Je3NvhNQ+IcbOXaTTzlQSicptU8TXsvbzO2GmbkiiPxZXhREhFA5y/pNxGxdzI=" - -cache: - directories: - - $HOME/.ivy2/cache - - $HOME/.sbt - - $HOME/.coursier \ No newline at end of file diff --git a/README.md b/README.md index 1be63e1..dd59270 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # sonic-dependency-tree -[![Build Status](https://travis-ci.org/SupersonicAds/sonic-dependency-tree.svg?branch=master)](https://travis-ci.org/SupersonicAds/sonic-dependency-tree) +[![Build Status](https://github.com/SupersonicAds/sonic-dependency-tree/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/SupersonicAds/sonic-dependency-tree/actions?query=branch%3Amaster) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.supersonic/sonic-dependency-tree_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.supersonic/sonic-dependency-tree_2.12) SBT plugin for retrieving Scala modules and libraries dependencies and outputs it as JSON. As an identifier for current dependencies, we use Git commit. In addition, there's an option to upload the current commit project's dependencies to Amazon S3. @@ -15,8 +16,6 @@ It helps to keep track of module dependencies and library version used in each m Add the plugin as SBT dependency to your `project/plugins.sbt` ``` -resolvers += Resolver.bintrayRepo("ironsonic", "sbt-plugins") - addSbtPlugin("com.supersonic" % "sonic-dependency-tree" % "0.0.2") ``` diff --git a/build.sbt b/build.sbt index a6e6577..168c56f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,6 @@ enablePlugins(ScriptedPlugin) enablePlugins(BuildInfoPlugin) -organization := "com.supersonic" name := "sonic-dependency-tree" scalacOptions ++= List( "-encoding", "UTF-8", @@ -15,6 +14,8 @@ scalacOptions ++= List( "-Xlint", "-Ypartial-unification") +sonatypeCredentialHost := Sonatype.sonatype01 + buildInfoKeys := List[BuildInfoKey]( name, version, @@ -34,15 +35,23 @@ scriptedLaunchOpts += ("-Dplugin.version=" + version.value) scriptedBufferLog := false inThisBuild(List( + organization := "com.supersonic", licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), homepage := Some(url("https://github.com/SupersonicAds/sonic-dependency-tree")), developers := List(Developer("SupersonicAds", "SupersonicAds", "SupersonicAds", url("https://github.com/SupersonicAds"))), scmInfo := Some(ScmInfo(url("https://github.com/SupersonicAds/sonic-dependency-tree"), "scm:git:git@github.com:SupersonicAds/sonic-dependency-tree.git")), - pgpPublicRing := file("./travis/local.pubring.asc"), - pgpSecretRing := file("./travis/local.secring.asc"), - releaseEarlyEnableSyncToMaven := false, - releaseEarlyWith := BintrayPublisher)) + githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))), + githubWorkflowTargetTags ++= Seq("v*"), + githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted"))), + githubWorkflowPublish := Seq( + WorkflowStep.Sbt( + List("ci-release"), + env = Map( + "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}", + "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}", + "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}", + "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}"))))) libraryDependencies ++= Seq( "com.typesafe.play" %% "play-json" % "2.8.0", diff --git a/project/build.properties b/project/build.properties index d6a5af2..52a0b0e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.3.4 \ No newline at end of file +sbt.version = 1.5.0 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 1f1bf12..9de7def 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,9 @@ libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value -addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1") - addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") + +addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") + +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") diff --git a/travis/secrets.tar.enc b/travis/secrets.tar.enc deleted file mode 100644 index 28dc2945093570f0e6290f65d1d7c83444268aea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8208 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 CJoqaB From feb9b9d910c4c018dd61c0368cff33ff1be3744c Mon Sep 17 00:00:00 2001 From: Anton Troshin Date: Tue, 27 Apr 2021 20:24:01 +0300 Subject: [PATCH 2/3] revert sbt and cleanup --- build.sbt | 11 ----------- project/build.properties | 2 +- project/plugins.sbt | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 168c56f..8c9bf4f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,4 @@ enablePlugins(ScriptedPlugin) -enablePlugins(BuildInfoPlugin) name := "sonic-dependency-tree" scalacOptions ++= List( @@ -16,16 +15,6 @@ scalacOptions ++= List( sonatypeCredentialHost := Sonatype.sonatype01 -buildInfoKeys := List[BuildInfoKey]( - name, - version, - scalaVersion, - sbtVersion, - "gitCommit" -> git.gitHeadCommit.value.getOrElse(""), - "gitDescribedVersion" -> git.gitDescribedVersion.value.getOrElse("")) - -buildInfoPackage := organization.value - makePomConfiguration := makePomConfiguration.value.withConfigurations(Configurations.defaultMavenConfigurations) resolvers += Resolver.jcenterRepo diff --git a/project/build.properties b/project/build.properties index 52a0b0e..724e82e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.0 \ No newline at end of file +sbt.version = 1.4.9 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 9de7def..b864920 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,8 +2,6 @@ libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") - addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") From d8ec5eb3951b570e16d7481601325d689f62c9e6 Mon Sep 17 00:00:00 2001 From: Anton Troshin Date: Tue, 27 Apr 2021 20:27:01 +0300 Subject: [PATCH 3/3] Regenerate CI --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2380d18..39fd2f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13] + scala: [2.12.12] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -70,7 +70,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13] + scala: [2.12.12] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -96,12 +96,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.13) + - name: Download target directories (2.12.12) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }} - - name: Inflate target directories (2.12.13) + - name: Inflate target directories (2.12.12) run: | tar xf targets.tar rm targets.tar