Update .gitpod.dockerfile

2025-12-08 17:30:01 +01:00 · 2020-07-07 09:41:33 -04:00 · 2020-07-07 01:19:30 -04:00 · 2020-07-07 01:06:19 -04:00 · 2020-07-07 00:43:08 -04:00 · 2020-07-07 00:25:56 -04:00
7 changed files with 80 additions and 83 deletions
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -0,0 +1,7 @@
+FROM gitpod/workspace-full
+
+USER root
+RUN sudo apt-get update && apt-get install -y apt-transport-https \
+ && sudo apt-get install -y \
+    xserver-xorg-dev libxext-dev libxi-dev build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev \
+ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,3 +1,5 @@
+image:
+  file: .gitpod.dockerfile
 tasks:
  - init: npm run setup
    command: npm start
@@ -7,11 +9,10 @@ ports:

 github:
  prebuilds:
-    master: true
    branches: true
    pullRequests: true
    pullRequestsFromForks: true
    addCheck: true
    addComment: true
    addBadge: false
-    addLabel: false
+    addLabel: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,22 @@ before_script:
  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
  - chmod +x ./cc-test-reporter
  - ./cc-test-reporter before-build
-script:
-  - npm test
-  - npm run benchmark
-  - npm run gif-test
-  - grunt tests
-  - npm run core-tests
-  - npm run test-ui
-  - npm run test-ui-2
-  - grunt build
+jobs:
+  include:
+    - name: "Base istanbul/tape node tests"
+      script: npm test
+    - name: "Benchmark tests"
+      script: npm run benchmark
+    - name: "Gif tests"
+      script: npm run gif-test
+    - name: "Browserify core tests and run"
+      script: grunt tests && npm run core-tests
+    - name: "Jasmine UI tests (mocked browser env)"
+      script: npm run test-ui
+    - name: "jest-puppeteer UI tests (full browser env)"
+      script: npm run test-ui-2
+    - name: "Grunt build test of dev environment"
+      script: grunt build
 after_success:
  - bash <(curl -s https://codecov.io/bash)
 after_script:
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,7 +44,14 @@ module.exports = function(grunt) {
        dest: 'dist/image-sequencer-ui.brow.js'
      },
      tests: {
-        src: ['test/core/sequencer/meta-modules.js', 'test/core/sequencer/image-sequencer.js', 'test/core/sequencer/chain.js', 'test/core/sequencer/replace.js', 'test/core/sequencer/import-export.js', 'test/core/sequencer/run.js', 'test/core/sequencer/dynamic-imports.js', 'test/core/util/*.js'],
+        src: ['test/core/sequencer/meta-modules.js',
+              'test/core/sequencer/image-sequencer.js',
+              'test/core/sequencer/chain.js',
+              'test/core/sequencer/replace.js',
+              'test/core/sequencer/import-export.js',
+              'test/core/sequencer/run.js',
+              'test/core/sequencer/dynamic-imports.js',
+              'test/core/util/*.js'],
        dest: './output/core-tests.js'
      }
    },
--- a/package-lock.json
+++ b/package-lock.json
@@ -2579,9 +2579,9 @@
      "dev": true
    },
    "browser-launcher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browser-launcher/-/browser-launcher-1.0.1.tgz",
-      "integrity": "sha512-XLZ96W4jzKOBMcrE7juOusdiIzbZRG3q/sPGh5ytZJSJ7/JndKqoUjfHdiXFzxILidIjsj79rCKUHAIKxJCUCw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/browser-launcher/-/browser-launcher-2.0.0.tgz",
+      "integrity": "sha512-bdmq+JQ+Jy8Bx5PpzvJHKP24iR4DEcbXz3v96YZRhSHuzdmS/fIT6mT+28SQrrwZ+GTTFBixUej+DM18fsl0JA==",
      "dev": true,
      "requires": {
        "headless": "~0.1.3",
@@ -2591,6 +2591,11 @@
        "xtend": "^4.0.0"
      },
      "dependencies": {
+        "headless": {
+          "version": "0.1.3",
+          "bundled": true,
+          "dev": true
+        },
        "minimist": {
          "version": "0.0.5",
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
@@ -2642,19 +2647,18 @@
      }
    },
    "browser-run": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/browser-run/-/browser-run-6.0.0.tgz",
-      "integrity": "sha512-vzYaoi10x9bJcZRLj30Y/j1jSDs3g3wm4R6y0swv5ZoXwxJ+ykSBkizQP1HPiCiH6R4qD2FhvRxj0mYxeXHpCA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/browser-run/-/browser-run-7.0.2.tgz",
+      "integrity": "sha512-svPk5SVAPOfG4g6Dj0RKTNaJFomtrJu0uJpZtOF+/pNZYYZBf57o0LAshkw4pXD61ZNzeK2JTArKARTxVlnmoQ==",
      "dev": true,
      "requires": {
-        "browser-launcher": "^1.0.1",
+        "browser-launcher": "^2.0.0",
        "duplexer": "^0.1.1",
        "ecstatic": "^4.1.2",
        "electron-stream": "^7.0.1",
        "enstore": "^1.0.1",
        "html-inject-script": "^1.1.0",
        "optimist": "^0.6.1",
-        "phantomjs-stream": "^1.1.1",
        "server-destroy": "^1.0.1",
        "source-map-support": "^0.4.0",
        "through": "^2.3.8",
@@ -4625,9 +4629,9 @@
      },
      "dependencies": {
        "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
          "dev": true
        }
      }
@@ -4639,9 +4643,9 @@
      "dev": true
    },
    "electron": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.10.tgz",
-      "integrity": "sha512-OSyxTlJ+7Yf0B+6pTdHdxY9RvI4U+mVKAbn+CkAOWxlCPMg3K+jt5UHKSPRRLnXQhQ0Tulg4vupbC0k27aukVw==",
+      "version": "5.0.13",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.13.tgz",
+      "integrity": "sha512-AM73AMZpb/5zm8eIXsIcp2eMdniD5WO+FqMtlIzhhtSjixflDm0pLtgudz0fHtiT/w6V+6YcpDVb4TtHtrJbHQ==",
      "dev": true,
      "requires": {
        "@types/node": "^10.12.18",
@@ -4650,9 +4654,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "10.14.16",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.16.tgz",
-          "integrity": "sha512-/opXIbfn0P+VLt+N8DE4l8Mn8rbhiJgabU96ZJ0p9mxOkIks5gh6RUnpHak7Yh0SFkyjO/ODbxsQQPV2bpMmyA==",
+          "version": "10.17.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz",
+          "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw==",
          "dev": true
        }
      }
@@ -4699,12 +4703,6 @@
          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
        }
      }
    },
@@ -7784,12 +7782,6 @@
      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
      "dev": true
    },
-    "headless": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/headless/-/headless-0.1.3.tgz",
-      "integrity": "sha1-xZVzTupV7SJ2EbndhKY7UY4RFVM=",
-      "dev": true
-    },
    "hmac-drbg": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -13265,15 +13257,6 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
-    "phantomjs-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/phantomjs-stream/-/phantomjs-stream-1.1.1.tgz",
-      "integrity": "sha1-VlD0ICjAnoRrxGO4K/TK/EOjuis=",
-      "dev": true,
-      "requires": {
-        "stream-read": "^1.1.2"
-      }
-    },
    "picomatch": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.5.tgz",
@@ -15959,13 +15942,13 @@
      }
    },
    "tape-run": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/tape-run/-/tape-run-6.0.1.tgz",
-      "integrity": "sha512-j6k5NbHL6Ww2E3uxng7pZPr5uNFWkVuZd1u5ZWW2QunofLl08nASxmzmrj0Tphvtse6rKO9FA1ibruzY2a1IGA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/tape-run/-/tape-run-7.0.0.tgz",
+      "integrity": "sha512-cQytZDcfaHiWcm8PjOXAw8V+HLKvEkFNz0NZRXQA1H/cef6iB2CuqE6TzZlsiwKAomrVQ6xIpuY32RsMmPYQfg==",
      "dev": true,
      "requires": {
        "@juliangruber/tap-finished": "0.0.2",
-        "browser-run": "^6.0.0",
+        "browser-run": "^7.0.1",
        "optimist": "~0.6.1",
        "through": "~2.3.4",
        "throughout": "0.0.0"
@@ -17085,9 +17068,9 @@
      }
    },
    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
      "dev": true
    },
    "whatwg-encoding": {
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
    "matchdep": "^2.0.0",
    "tap-spec": "^5.0.0",
    "tape": "^4.9.2",
-    "tape-run": "^6.0.0",
+    "tape-run": "^7.0.0",
    "uglify-es": "^3.3.7"
  },
  "husky": {
--- a/yarn.lock
+++ b/yarn.lock
@@ -1302,10 +1302,10 @@ brorand@^1.0.1:
  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=

-browser-launcher@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browser-launcher/-/browser-launcher-1.0.1.tgz#de5e0ed172602e853c40be813c03d2af3a606404"
-  integrity sha512-XLZ96W4jzKOBMcrE7juOusdiIzbZRG3q/sPGh5ytZJSJ7/JndKqoUjfHdiXFzxILidIjsj79rCKUHAIKxJCUCw==
+browser-launcher@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/browser-launcher/-/browser-launcher-2.0.0.tgz#71993694b1fcc670fadefb7aaf0ef52ba8b69d66"
+  integrity sha512-bdmq+JQ+Jy8Bx5PpzvJHKP24iR4DEcbXz3v96YZRhSHuzdmS/fIT6mT+28SQrrwZ+GTTFBixUej+DM18fsl0JA==
  dependencies:
    headless "~0.1.3"
    minimist "0.0.5"
@@ -1337,19 +1337,18 @@ browser-resolve@^1.11.0, browser-resolve@^1.11.3, browser-resolve@^1.7.0:
  dependencies:
    resolve "1.1.7"

-browser-run@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/browser-run/-/browser-run-6.0.0.tgz#bb5c065b131789c6ce41830596fad7b6b638864a"
-  integrity sha512-vzYaoi10x9bJcZRLj30Y/j1jSDs3g3wm4R6y0swv5ZoXwxJ+ykSBkizQP1HPiCiH6R4qD2FhvRxj0mYxeXHpCA==
+browser-run@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/browser-run/-/browser-run-7.0.2.tgz#11cf1001d1e07a1903cc4a53100131953367566d"
+  integrity sha512-svPk5SVAPOfG4g6Dj0RKTNaJFomtrJu0uJpZtOF+/pNZYYZBf57o0LAshkw4pXD61ZNzeK2JTArKARTxVlnmoQ==
  dependencies:
-    browser-launcher "^1.0.1"
+    browser-launcher "^2.0.0"
    duplexer "^0.1.1"
    ecstatic "^4.1.2"
    electron-stream "^7.0.1"
    enstore "^1.0.1"
    html-inject-script "^1.1.0"
    optimist "^0.6.1"
-    phantomjs-stream "^1.1.1"
    server-destroy "^1.0.1"
    source-map-support "^0.4.0"
    through "^2.3.8"
@@ -7725,13 +7724,6 @@ performance-now@^2.1.0:
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

-phantomjs-stream@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/phantomjs-stream/-/phantomjs-stream-1.1.1.tgz#5650f42028c09e846bc463b82bf4cafc43a3ba2b"
-  integrity sha1-VlD0ICjAnoRrxGO4K/TK/EOjuis=
-  dependencies:
-    stream-read "^1.1.2"
-
 picomatch@^2.0.4:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
@@ -9619,13 +9611,13 @@ tap-spec@^5.0.0:
    tap-out "^2.1.0"
    through2 "^2.0.0"

-tape-run@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/tape-run/-/tape-run-6.0.1.tgz#f017357c094a8c005aecffd7579ac8ef56a3e86c"
-  integrity sha512-j6k5NbHL6Ww2E3uxng7pZPr5uNFWkVuZd1u5ZWW2QunofLl08nASxmzmrj0Tphvtse6rKO9FA1ibruzY2a1IGA==
+tape-run@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tape-run/-/tape-run-7.0.0.tgz#753d9e7f3e1a621b947cc61717b7527024b5d4c2"
+  integrity sha512-cQytZDcfaHiWcm8PjOXAw8V+HLKvEkFNz0NZRXQA1H/cef6iB2CuqE6TzZlsiwKAomrVQ6xIpuY32RsMmPYQfg==
  dependencies:
    "@juliangruber/tap-finished" "0.0.2"
-    browser-run "^6.0.0"
+    browser-run "^7.0.1"
    optimist "~0.6.1"
    through "~2.3.4"
    throughout "0.0.0"
@@ -10377,9 +10369,9 @@ websocket-driver@>=0.5.1:
    websocket-extensions ">=0.1.1"

 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==

 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
  version "1.0.5"
Author	SHA1	Message	Date
Jeffrey Warren	c39649485a	Update .gitpod.dockerfile	2020-07-07 09:41:33 -04:00
Jeffrey Warren	b6904d9854	Update .gitpod.dockerfile	2020-07-07 01:19:30 -04:00
Jeffrey Warren	1eba76e96e	Update .gitpod.dockerfile	2020-07-07 01:06:19 -04:00
Jeffrey Warren	c15865dc7d	Update .gitpod.dockerfile	2020-07-07 00:43:08 -04:00
Jeffrey Warren	3a3a680f5e	Merge branch 'main' into gitpod-dockerfile	2020-07-07 00:25:56 -04:00
Jeffrey Warren	29c7c63c08	Create .gitpod.dockerfile	2020-07-07 00:25:05 -04:00
Jeffrey Warren	57a50f57a7	Update .gitpod.yml	2020-07-07 00:22:19 -04:00
dependabot-preview[bot]	fb303a8ca9	[Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#1671 ) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. This update includes a security fix. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-07-07 00:20:51 -04:00
Jeffrey Warren	102b82bd34	Split tests into separate Travis jobs with better labeling (#1684 ) * Split tests into separate Travis jobs with better labeling * format test browserification * more descriptive labels * combine grunt browserify of tests and the run of those tests	2020-07-07 00:03:02 -04:00
dependabot-preview[bot]	222d217d6d	Bump tape-run from 6.0.1 to 7.0.0 (#1662 ) Bumps [tape-run](https://github.com/juliangruber/tape-run) from 6.0.1 to 7.0.0. - [Release notes](https://github.com/juliangruber/tape-run/releases) - [Changelog](https://github.com/juliangruber/tape-run/blob/master/History.md) - [Commits](https://github.com/juliangruber/tape-run/compare/v6.0.1...v7.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>	2020-07-06 11:50:29 -04:00
Jeffrey Warren	ef3afc00e2	.gitpod.yml - default branch prebuilds are on by default so removing this also undoes #1680	2020-07-06 08:57:33 -04:00
Jeffrey Warren	325a5660d5	update gitpod conf to main branch? (#1680 )	2020-07-05 18:22:46 -04:00