Merge branch 'develop' into convert-to-esm

* develop: (actions) also run on PR. (RobotWebTools#479) Fix security issues (RobotWebTools#478)
trusktr · Sep 17, 2021 · fbd53bc · fbd53bc
2 parents 1a7b720 + 15cf667
commit fbd53bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,10 +1,6 @@
 name: CI
 
-on:
-  push:
-  pull_request:
-    branches-ignore:
-      - develop
+on: [push, pull_request]
 
 jobs:
   ci:

diff --git a/package-lock.json b/package-lock.json