Skip to content

Commit

Permalink
Merge pull request #33 from danicheg/fix-integration-test
Browse files Browse the repository at this point in the history
Cross build for Scala 2.13: Putting the finishing touches
  • Loading branch information
sjrd authored Oct 25, 2023
2 parents a2f37bf + 711bf78 commit 33b59cb
Show file tree
Hide file tree
Showing 48 changed files with 447 additions and 639 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
name: CI
on:
push:
branches:
- main
tags: ["*"]
branches: ['**', '!update/**', '!pr/**']
pull_request:
branches:
- main
branches: ['**', '!update/**', '!pr/**']

jobs:
test:
name: ${{ matrix.command }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
command:
- sbt "plugin/test" "^^0.13.17 profilingSbtPlugin/scripted" "^^1.1.1 profilingSbtPlugin/scripted compiler-profiling/*"
- sbt "showScalaInstances" "integrations/testOnly circe integration monocle better-files scalac"
- sbt "showScalaInstances" "integrations/testOnly scalatest shapeless"
- sbt "+plugin/test" "profilingSbtPlugin/scripted compiler-profiling/scripted"
- sbt "showScalaInstances" "integrations/testOnly integration better-files wartremover"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: olafurpg/setup-scala@v13
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Release
on:
push:
branches: [main]
tags: ["*"]
jobs:
publish:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
cache: sbt
- 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 }}
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,10 @@ project/plugins/project/
.hidden
.profiledb_211
.proxy

# metals vscode
.bloop
.bsp
.metals
.vscode
metals.sbt
10 changes: 1 addition & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
[submodule "scalac"]
path = scalac
url = [email protected]:scalacenter/scala.git
branch = 2.12.x
[submodule "vscode-scala"]
path = vscode-scala
url = [email protected]:scalacenter/vscode-scala-profiledb.git
branch = profiledb-integration
[submodule "sbt-plugin/src/sbt-test/external-projects/circe"]
path = sbt-plugin/src/sbt-test/external-projects/circe
url = https://github.com/jvican/circe
branch = master-with-sbt-profiling
[submodule "FlameGraph"]
path = FlameGraph
url = git://github.com/jvican/FlameGraph.git
url = git@github.com:jvican/FlameGraph.git
Loading

0 comments on commit 33b59cb

Please sign in to comment.