Skip to content

Commit 78d9ef5

Browse files
authored
Merge pull request #512 from scala-js/merge-1.x
Merge series/1.x into master
2 parents 8de8df1 + 11f0036 commit 78d9ef5

40 files changed

+51696
-235
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: github-actions
5+
directory: "/"
6+
schedule:
7+
interval: daily
8+
open-pull-requests-limit: 10
9+

.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: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,46 @@
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:
1314
fail-fast: false
1415
matrix:
1516
scalaversion: ["2.11.12", "2.12.12", "2.13.4", "3.0.1"]
1617
steps:
18+
1719
- uses: actions/checkout@v2
18-
- uses: olafurpg/setup-scala@v10
19-
with:
20-
java-version: "[email protected]"
21-
- uses: coursier/cache-action@v5
20+
21+
- name: Setup Scala
22+
uses: japgolly/[email protected]
23+
2224
- name: Build
2325
run: sbt "++${{ matrix.scalaversion }}" package
26+
2427
- name: Test generate documentation
2528
run: sbt "++${{ matrix.scalaversion }}" doc
29+
2630
- name: Build examples
2731
run: sbt "++${{ matrix.scalaversion }}" example/compile
28-
- name: scalafmt
32+
33+
- name: Validate formatting
2934
run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
35+
36+
- name: Validate api report
37+
if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.0.1'
38+
run: ./api-reports/validate "${{ matrix.scalaversion }}"
39+
3040
readme:
3141
runs-on: ubuntu-latest
3242
steps:
3343
- uses: actions/checkout@v2
34-
- uses: olafurpg/setup-scala@v10
35-
with:
36-
java-version: "[email protected]"
37-
- uses: coursier/cache-action@v5
44+
- uses: japgolly/[email protected]
3845
- name: Readme generation
3946
run: sbt readme/run

.github/workflows/ghpages.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v10
15-
with:
16-
java-version: "[email protected]"
17-
- uses: coursier/cache-action@v5
14+
15+
- name: Setup Scala
16+
uses: japgolly/[email protected]
1817

1918
- name: Build
2019
run: sbt readme/run
2120

2221
- name: Deploy
23-
uses: JamesIves/github-pages-deploy-action@3.6.2
22+
uses: JamesIves/github-pages-deploy-action@4.1.5
2423
with:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
BRANCH: gh-pages
27-
FOLDER: readme/target/scalatex
24+
token: ${{ secrets.GITHUB_TOKEN }}
25+
branch: gh-pages
26+
folder: readme/target/scalatex

.github/workflows/release-drafter.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
- series/1.x
9+
10+
jobs:
11+
update_release_draft:
12+
runs-on: ubuntu-latest
13+
steps:
14+
# Drafts your next Release notes as Pull Requests are merged into "master"
15+
- uses: release-drafter/release-drafter@v5
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
16+
- uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Setup Scala
21+
uses: japgolly/[email protected]
22+
23+
- name: Hacks for Scala 2.10
24+
run: ./prepareForScala210.sh
25+
26+
- name: Release
27+
run: sbt ci-release
28+
env:
29+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
30+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
31+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
32+
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)