Skip to content

Commit 5e41edb

Browse files
committed
Update release.yml
1 parent 685471f commit 5e41edb

File tree

8 files changed

+55
-27
lines changed

8 files changed

+55
-27
lines changed

.github/.jvmopts

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,38 @@ on:
33
push:
44
branches: [master]
55
tags: ["v*.*.*"]
6+
7+
env:
8+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
9+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
10+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
11+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
12+
DEMO_ENABLED: 0
13+
614
jobs:
715
publish:
816
runs-on: ubuntu-latest
917
steps:
18+
- if: ${{ github.ref == 'ref/tags/v*' }}
19+
run: |
20+
echo "PUBLISH_VERSION=1" >> $GITHUB_ENV
1021
- uses: actions/checkout@v2.3.3
1122
- uses: olafurpg/setup-scala@v10
1223
- uses: actions/setup-node@v1
1324
- uses: olafurpg/setup-gpg@v3
25+
- name: Cache dependencies
26+
uses: actions/cache@v1
27+
with:
28+
path: ~/.cache/coursier/v1
29+
key: ${{ runner.os }}-coursier-${{ hashFiles('build.sbt') }}-${{ hashFiles('project/*.scala') }}
30+
restore-keys: ${{ runner.os }}-coursier-
31+
- name: Cache .sbt
32+
uses: actions/cache@v1
33+
with:
34+
path: ~/.sbt
35+
key: ${{ runner.os }}-sbt-${{ hashFiles('build.sbt') }}-${{ hashFiles('project/*.scala') }}
36+
restore-keys: ${{ runner.os }}-sbt-
1437
- name: Publish
15-
run: DEMO_ENABLED=0 sbt -jvm-opts .github/.jvmopts clean ci-release
16-
env:
17-
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
18-
PGP_SECRET: ${{ secrets.PGP_SECRET }}
19-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
20-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
38+
run: sbt clean ci-release
2139
- name: Publish 0.6
22-
run: SCALAJS_VERSION=0.6.33 DEMO_ENABLED=0 sbt -jvm-opts .github/.jvmopts clean ci-release
23-
env:
24-
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
25-
PGP_SECRET: ${{ secrets.PGP_SECRET }}
26-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
27-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
40+
run: SCALAJS_VERSION=0.6.33 sbt clean ci-release

.sbtopts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-J-Xms2G
2+
-J-Xmx2G
3+
-J-XX:+UseG1GC

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In the demo you can also find very detailed examples of using a bunch of:
5252
- [ScalablyTyped/Distribution](https://github.com/ScalablyTyped/Distribution)
5353

5454
Start:
55-
1. `sbt -mem 2048 runDev`
55+
1. `sbt runDev`
5656
2. Open in browser `localhost:8080`
5757

5858
## License

build.sbt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ inThisBuild(
2828

2929
lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")
3030

31-
lazy val core = (project in file("core")).dependsOn(bridge)
31+
lazy val core = (project in file("core"))
32+
.dependsOn(bridge)
33+
.configure(Settings.publishArtifactSettings)
3234
.settings(commonSettings).settings(
3335
name := "scalajs-react-material-ui-core",
3436
scalaJSUseMainModuleInitializer := false,
@@ -44,7 +46,9 @@ lazy val core = (project in file("core")).dependsOn(bridge)
4446

4547
lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
4648

47-
lazy val icons = (project in file("icons")).dependsOn(bridge)
49+
lazy val icons = (project in file("icons"))
50+
.dependsOn(bridge)
51+
.configure(Settings.publishArtifactSettings)
4852
.settings(commonSettings).settings(
4953
name := "scalajs-react-material-ui-icons",
5054
scalaJSUseMainModuleInitializer := false,
@@ -58,7 +62,9 @@ lazy val icons = (project in file("icons")).dependsOn(bridge)
5862
sourceGenerators in Compile += muiIconsGenerator.taskValue
5963
).enablePlugins(ScalaJSBundlerPlugin)
6064

61-
lazy val lab = (project in file("lab")).dependsOn(bridge)
65+
lazy val lab = (project in file("lab"))
66+
.dependsOn(bridge)
67+
.configure(Settings.publishArtifactSettings)
6268
.settings(commonSettings).settings(
6369
name := "scalajs-react-material-ui-lab",
6470
scalaJSUseMainModuleInitializer := false,
@@ -84,7 +90,9 @@ lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
8490
skip in publish := true
8591
).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
8692

87-
lazy val bridge = (project in file("utils/bridge")).settings(commonSettings).settings(
93+
lazy val bridge = (project in file("utils/bridge"))
94+
.configure(Settings.publishArtifactSettings)
95+
.settings(commonSettings).settings(
8896
name := "scalajs-react-bridge",
8997
scalaJSUseMainModuleInitializer := false,
9098
npmDependencies in Compile ++= Settings.npmDependenciesBridge.value,

project/Settings.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ object Settings {
1010

1111
val isDemoEnabled = Option(System.getenv("DEMO_ENABLED")).getOrElse("1").startsWith("1")
1212

13+
val isPublishVersion = Option(System.getenv("PUBLISH_VERSION")).getOrElse("0").startsWith("1")
14+
1315
object versions {
1416
object bundler {
1517
val webpack = "4.41.5"
@@ -98,4 +100,13 @@ object Settings {
98100
skip in publishArtifact := true,
99101
Keys.`package` := file("")
100102
)
103+
104+
lazy val publishArtifactSettings: Project => Project = project =>
105+
if (isPublishVersion)
106+
project
107+
else
108+
project.settings(
109+
publishArtifact in(Compile, packageDoc) := false,
110+
publishArtifact in(Compile, packageSrc) := false
111+
)
101112
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.4.2
1+
sbt.version = 1.4.2

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.1")
22

3-
resolvers += Resolver.sonatypeRepo("public")
3+
resolvers += Resolver.sonatypeRepo("snapshots")
44
resolvers += Resolver.bintrayRepo("oyvindberg", "converter")
55

66
addSbtPlugin("org.scalablytyped.converter" % s"sbt-converter${if (scalaJSVersion.startsWith("0.6")) "06" else ""}" % "1.0.0-beta28")
@@ -11,4 +11,4 @@ addSbtPlugin("ch.epfl.scala" % s"sbt-scalajs-bundler${if (scalaJSVersion.startsW
1111

1212
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.14")
1313

14-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4")
14+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4")

0 commit comments

Comments
 (0)