Merge pull request #996 from processing/main

merge main into teach

Author: lmccart

.github/workflows/deploy.yaml

@@ -0,0 +1,25 @@
+name: Test and Deploy
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: "14.x"
+    - name: Install node modules
+      run: npm ci
+    - name: Build
+      run: npm run build
+    - name: Deploy 🚀
+      uses: JamesIves/[email protected]
+      with:
+        branch: gh-pages # The branch the action should deploy to.
+        folder: dist/ # The folder the action should deploy.
+        single-commit: false # "false" here means "preserve git history on the gh-pages branch"

.github/workflows/test.yml

@@ -1,29 +1,23 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Node.js CI
+name: Test
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm test
+        node-version: "14.x"
+    - name: Install node modules
+      run: npm ci
+    - name: Run tests
+      run: npm test
+      

.travis.yml

@@ -442,8 +442,11 @@ module.exports = function(grunt) {
   grunt.registerTask('move_dataJSON', function() {
     const dataJSON_p5js = 'tmp/p5.js/docs/reference/data.json';
     const dataJSON_p5jswebsite = 'src/templates/pages/reference/data.json';
-    // move the data.json from the cloned p5.js repository to the p5.js-website repository
+    const dataJSONmin_p5js = 'tmp/p5.js/docs/reference/data.min.json';
+    const dataJSONmin_p5jswebsite = 'src/templates/pages/reference/data.min.json';
+    // move the data.json files from the cloned p5.js repository to the p5.js-website repository
     fse.moveSync(dataJSON_p5js, dataJSON_p5jswebsite, { overwrite: true });
+    fse.moveSync(dataJSONmin_p5js, dataJSONmin_p5jswebsite, { overwrite: true });
     // delete the tmp folder that contained the p5.js repository
     fse.removeSync('tmp/');
   });