Merge pull request #1713 from softwaremill/update/sbt-scalajs-1.13.0

Update sbt-scalajs, scalajs-library_2.13, ... to 1.13.0
softwaremill · Jan 31, 2023 · 166a858 · 166a858
2 parents e4a79da + 64fb162
commit 166a858
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,11 @@ jobs:
       matrix:
         scala-version: [ "2.11", "2.12", "2.13", "3" ]
         target-platform: [ "JVM", "JS", "Native" ]
+        exclude:
+          - scala-version: "2.11"
+            target-platform: "JS"
+          - scala-version: "2.11"
+            target-platform: "Native"
     steps:
     - name: Checkout
       uses: actions/checkout@v2

diff --git a/.mergify.yml b/.mergify.yml
@@ -10,11 +10,9 @@ pull_request_rules:
       - check-success=ci (2.12, JVM)
       - check-success=ci (2.13, JVM)
       - check-success=ci (3, JVM)
-      - check-success=ci (2.11, JS)
       - check-success=ci (2.12, JS)
       - check-success=ci (2.13, JS)
       - check-success=ci (3, JS)
-      - check-success=ci (2.11, Native)
       - check-success=ci (2.12, Native)
       - check-success=ci (2.13, Native)
       - check-success=ci (3, Native)
@@ -31,11 +29,9 @@ pull_request_rules:
       - check-success=ci (2.12, JVM)
       - check-success=ci (2.13, JVM)
       - check-success=ci (3, JVM)
-      - check-success=ci (2.11, JS)
       - check-success=ci (2.12, JS)
       - check-success=ci (2.13, JS)
       - check-success=ci (3, JS)
-      - check-success=ci (2.11, Native)
       - check-success=ci (2.12, Native)
       - check-success=ci (2.13, Native)
       - check-success=ci (3, Native)
@@ -52,11 +48,9 @@ pull_request_rules:
       - check-success=ci (2.12, JVM)
       - check-success=ci (2.13, JVM)
       - check-success=ci (3, JVM)
-      - check-success=ci (2.11, JS)
       - check-success=ci (2.12, JS)
       - check-success=ci (2.13, JS)
       - check-success=ci (3, JS)
-      - check-success=ci (2.11, Native)
       - check-success=ci (2.12, Native)
       - check-success=ci (2.13, Native)
       - check-success=ci (3, Native)
@@ -72,11 +66,9 @@ pull_request_rules:
       - check-success=ci (2.12, JVM)
       - check-success=ci (2.13, JVM)
       - check-success=ci (3, JVM)
-      - check-success=ci (2.11, JS)
       - check-success=ci (2.12, JS)
       - check-success=ci (2.13, JS)
       - check-success=ci (3, JS)
-      - check-success=ci (2.11, Native)
       - check-success=ci (2.12, Native)
       - check-success=ci (2.13, Native)
       - check-success=ci (3, Native)
@@ -93,11 +85,9 @@ pull_request_rules:
       - check-success=ci (2.12, JVM)
       - check-success=ci (2.13, JVM)
       - check-success=ci (3, JVM)
-      - check-success=ci (2.11, JS)
       - check-success=ci (2.12, JS)
       - check-success=ci (2.13, JS)
       - check-success=ci (3, JS)
-      - check-success=ci (2.11, Native)
       - check-success=ci (2.12, Native)
       - check-success=ci (2.13, Native)
       - check-success=ci (3, Native)