From fdd7d79aaaeb729220c76f5a0ec0d722a56f14e4 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Tue, 22 Feb 2022 13:36:10 -0600 Subject: [PATCH] fixed williams test, github build stops if test fails --- .github/workflows/node.js.yml | 9 ++-- package-lock.json | 91 +++++++++++++++++------------------ src/platform/williams.ts | 1 + 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 385b2fa8..a28966e8 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -11,14 +11,11 @@ on: jobs: build: - runs-on: ubuntu-latest - strategy: matrix: node-version: [16.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 }} @@ -30,9 +27,15 @@ jobs: - run: git submodule update - run: npm ci - run: npm run build --if-present + test: + needs: build + steps: - run: npm test env: TEST8BIT_GITHUB_TOKEN: ${{ secrets.TEST8BIT_GITHUB_TOKEN }} + deploy: + needs: test + steps: - run: make distro - name: Deploy uses: JamesIves/github-pages-deploy-action@v4.2.5 diff --git a/package-lock.json b/package-lock.json index a11e91b6..70d390d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,6 @@ "jszip": "^3.7.0", "localforage": "^1.9.0", "mousetrap": "^1.6.5", - "nightwatch": "^2.0.5", "octokat": "^0.10.0", "preact": "^10.5.14", "split.js": "^1.6.2", @@ -1925,6 +1924,24 @@ "pend": "~1.2.0" } }, + "node_modules/fetch-vcr": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", + "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", + "dependencies": { + "node-fetch": "^1.6.3", + "whatwg-fetch": "^2.0.3" + } + }, + "node_modules/fetch-vcr/node_modules/node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "dependencies": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, "node_modules/file-saver": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", @@ -1987,9 +2004,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "funding": [ { "type": "individual", @@ -4269,24 +4286,6 @@ "node-fetch": "^2.0.0" } }, - "node_modules/octokat/node_modules/fetch-vcr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", - "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", - "dependencies": { - "node-fetch": "^1.6.3", - "whatwg-fetch": "^2.0.3" - } - }, - "node_modules/octokat/node_modules/fetch-vcr/node_modules/node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "dependencies": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -7595,6 +7594,26 @@ "pend": "~1.2.0" } }, + "fetch-vcr": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", + "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", + "requires": { + "node-fetch": "^1.6.3", + "whatwg-fetch": "^2.0.3" + }, + "dependencies": { + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } + } + }, "file-saver": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", @@ -7648,9 +7667,9 @@ } }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "optional": true }, "foreground-child": { @@ -9414,28 +9433,6 @@ "fetch-vcr": "^1.1.0", "lodash": "^4.16.4", "node-fetch": "^2.0.0" - }, - "dependencies": { - "fetch-vcr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", - "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", - "requires": { - "node-fetch": "^1.6.3", - "whatwg-fetch": "^2.0.3" - }, - "dependencies": { - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - } - } - } } }, "once": { diff --git a/src/platform/williams.ts b/src/platform/williams.ts index 54de92ab..747abd3e 100644 --- a/src/platform/williams.ts +++ b/src/platform/williams.ts @@ -15,6 +15,7 @@ var WilliamsPlatform = function(mainElement, proto, options) { var self = this; this.__proto__ = new (proto ? proto : Base6809Platform)(); + options = options || {}; var isDefender = options.isDefender; var SCREEN_HEIGHT = 304; var SCREEN_WIDTH = 256;