Skip to content

Commit 1745f98

Browse files
japgollyjapgolly
committed
Merge branch 'series/1.x' into idb-blocked
2 parents ca0d972 + 6d9ae70 commit 1745f98

File tree

28 files changed

+50077
-79
lines changed

28 files changed

+50077
-79
lines changed

‎.github/pull_request_template.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Hi there!
2+
3+
Before submitting a PR containing any Scala changes, please make sure you...
4+
5+
* run `sbt prePR`
6+
* commit changes to `api-reports`
7+
8+
Thanks for contributing!

‎.github/release-drafter.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name-template: 'v$NEXT_PATCH_VERSION'
2+
tag-template: 'v$NEXT_PATCH_VERSION'
3+
template: |
4+
# What's Changed
5+
$CHANGES
6+
categories:
7+
- title: 'New'
8+
label: 'type: feature'
9+
- title: 'Bug Fixes'
10+
label: 'type: bug'
11+
- title: 'Maintenance'
12+
label: 'type: maintenance'
13+
- title: 'Documentation'
14+
label: 'type: docs'
15+
- title: 'Dependency Updates'
16+
label: 'type: dependencies'

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: CI
2+
23
on:
3-
push:
4-
branches:
5-
- master
64
pull_request:
7-
branches:
8-
- master
5+
push:
6+
tags-ignore:
7+
- v*
8+
99
jobs:
10+
1011
build:
1112
runs-on: ubuntu-latest
1213
strategy:
@@ -20,26 +21,40 @@ jobs:
2021
env:
2122
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
2223
steps:
24+
2325
- uses: actions/checkout@v2
24-
- uses: olafurpg/setup-scala@v10
26+
- uses: olafurpg/setup-scala@v13
2527
with:
2628
java-version: "adopt@1.8"
27-
- uses: coursier/cache-action@v5
29+
- uses: coursier/cache-action@v6
30+
31+
- name: Hacks for Scala 2.10
32+
if: matrix.scalaversion == '2.10.7'
33+
run: ./prepareForScala210.sh
34+
2835
- name: Build
2936
run: sbt "++${{ matrix.scalaversion }}" package
37+
3038
- name: Test generate documentation
3139
run: sbt "++${{ matrix.scalaversion }}" doc
40+
3241
- name: Build examples
3342
run: sbt "++${{ matrix.scalaversion }}" example/compile
34-
- name: scalafmt
43+
44+
- name: Validate formatting
3545
run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
46+
47+
- name: Validate api report
48+
if: matrix.scalajsversion == '1.x' && matrix.scalaversion != '2.11.12'
49+
run: ./api-reports/validate "${{ matrix.scalaversion }}"
50+
3651
readme:
3752
runs-on: ubuntu-latest
3853
steps:
3954
- uses: actions/checkout@v2
40-
- uses: olafurpg/setup-scala@v10
55+
- uses: olafurpg/setup-scala@v13
4156
with:
4257
java-version: "adopt@1.8"
43-
- uses: coursier/cache-action@v5
58+
- uses: coursier/cache-action@v6
4459
- name: Readme generation
4560
run: sbt readme/run

‎.github/workflows/ghpages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v10
14+
- uses: olafurpg/setup-scala@v13
1515
with:
1616
java-version: "adopt@1.8"
17-
- uses: coursier/cache-action@v5
17+
- uses: coursier/cache-action@v6
1818

1919
- name: Build
2020
run: sbt readme/run

‎.github/workflows/release-drafter.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
# branches to consider in the event; optional, defaults to all
6+
branches:
7+
- master
8+
9+
jobs:
10+
update_release_draft:
11+
runs-on: ubuntu-latest
12+
steps:
13+
# Drafts your next Release notes as Pull Requests are merged into "master"
14+
- uses: release-drafter/release-drafter@v5
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Release
2+
on:
3+
push:
4+
branches: ["master", "series/1.x"]
5+
tags: ["v*"]
6+
jobs:
7+
publish:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
scalajsversion: ["1.x", "0.6.x"]
12+
env:
13+
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
14+
steps:
15+
- uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
- uses: olafurpg/setup-scala@v13
19+
- name: Hacks for Scala 2.10
20+
run: ./prepareForScala210.sh
21+
- run: sbt ci-release
22+
env:
23+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
24+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
25+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
26+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

‎.gitignore‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
target/
1+
.bloop
2+
.bsp
23
.cache
34
.classpath
5+
.idea
6+
.idea_modules
7+
.metals
48
.project
9+
.sbtboot
510
.settings/
6-
.idea
7-
.idea_modules
11+
.vscode
12+
metals.sbt
13+
target/

‎.scalafix.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
rules = [
2+
GenerateApiReport,
3+
]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[Documentation](http://scala-js.github.io/scala-js-dom)
1+
[Documentation](http://scala-js.github.io/scala-js-dom) / [Scaladoc](https://javadoc.io/doc/org.scala-js/scalajs-dom_sjs1_2.13)

0 commit comments

Comments
 (0)