From 6a86880bbe6a1313602f745086f58defaf74f885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sun, 27 Mar 2022 03:33:01 +0100 Subject: [PATCH] chore: fix mix github actions problems --- .github/workflows/browserstack.yml | 1 + .github/workflows/docs.yml | 6 ++-- README.md | 2 +- karma.browserstack.js | 44 ++++++++++++++++++++---------- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml index 35b0e85..1e58cb5 100644 --- a/.github/workflows/browserstack.yml +++ b/.github/workflows/browserstack.yml @@ -15,6 +15,7 @@ jobs: with: username: ${{ secrets.BROWSERSTACK_USERNAME }} access-key: ${{ secrets.BROWSERSTACK_ACCESSKEY }} + project-name: 'showdown' - name: 'BrowserStack Local Tunnel Setup' # Invokes the setup-local action uses: browserstack/github-actions/setup-local@master diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a8c4b50..3066b65 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,14 +2,12 @@ name: documentation on: push: - branches: + branches: - master paths: - 'mkdocs.yml' - 'docs/**' - '.github/workflows/docs.yml' - paths-ignore: - - 'README.md' jobs: build_docs: @@ -30,4 +28,4 @@ jobs: -H "Authorization: token ${TOKEN}" \ -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/repos/${OWNER}/${REPO}/dispatches \ - -d '{ "event_type": "e: \"'"${COMMIT}"'\" by '"${COMMITTER}"'", "client_payload": { "source": "showdown" } }' \ No newline at end of file + -d '{ "event_type": "e: \"'"${COMMIT}"'\" by '"${COMMITTER}"'", "client_payload": { "source": "showdown" } }' diff --git a/README.md b/README.md index 85a8173..1c4516e 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ![Build Status: Linux](https://github.com/showdownjs/showdown/actions/workflows/node.linux.yml/badge.svg) ![Build Status: Windows](https://github.com/showdownjs/showdown/actions/workflows/node.win.yml/badge.svg) +[![Browserstack Tests](https://automate.browserstack.com/badge.svg?badge_key=VTIvTDNqWVdaTHljbS9RNmYrcTBiL0Uxc3dkRDhaN1dPaXpPb2VOc1B2VT0tLU1Ib09kVjVzMjhFcHExbWFSWlJEV3c9PQ==--1fb92e1730e4a00630d17d533822de6403ca65ec)](https://automate.browserstack.com/public-build/VTIvTDNqWVdaTHljbS9RNmYrcTBiL0Uxc3dkRDhaN1dPaXpPb2VOc1B2VT0tLU1Ib09kVjVzMjhFcHExbWFSWlJEV3c9PQ==--1fb92e1730e4a00630d17d533822de6403ca65ec) [![npm version](https://badge.fury.io/js/showdown.svg)](http://badge.fury.io/js/showdown) [![Bower version](https://badge.fury.io/bo/showdown.svg)](http://badge.fury.io/bo/showdown) -[![Join the chat at https://gitter.im/showdownjs/showdown](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/showdownjs/showdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/tiviesantos) ------ diff --git a/karma.browserstack.js b/karma.browserstack.js index 9383755..c6d8b3c 100644 --- a/karma.browserstack.js +++ b/karma.browserstack.js @@ -5,7 +5,8 @@ module.exports = function (config) { username: process.env.BROWSERSTACK_USERNAME, accessKey: process.env.BROWSERSTACK_ACCESSKEY, project: 'showdown', - build: require('./package.json').version + build: require('./package.json').version, + name: 'Unit Testing' }, // define browsers @@ -13,26 +14,24 @@ module.exports = function (config) { bstack_chrome_windows: { base: 'BrowserStack', browser: 'chrome', - browser_version: '72.0', + browser_version: '49', os: 'Windows', os_version: '10' }, bstack_firefox_windows: { base: 'BrowserStack', browser: 'firefox', - browser_version: '98.0', + browser_version: '44', os: 'Windows', os_version: '10' }, - //dropped support for IE 10 - bstack_ie10_windows: { + bstack_edge_windows: { base: 'BrowserStack', - browser: 'ie', - browser_version: '10', + browser: 'edge', + browser_version: '15', os: 'Windows', - os_version: '7' + os_version: '10' }, - //dropped support for IE 10 bstack_ie11_windows: { base: 'BrowserStack', browser: 'ie', @@ -40,25 +39,40 @@ module.exports = function (config) { os: 'Windows', os_version: '10' }, + bstack_macos_safari: { + base: 'BrowserStack', + browser: 'safari', + browser_version: '10.1', + os: 'OS X', + os_version: 'Sierra' + }, bstack_iphoneX: { base: 'BrowserStack', browser: 'safari', - device: 'iPhone X', os: 'ios', - real_mobile: true, - os_version: '11.0' + os_version: '11.0', + device: 'iPhone X', + real_mobile: true + }, + bstack_android: { + base: 'BrowserStack', + browser: 'chrome', + os: 'android', + os_version:'4.4', + device: 'Samsung Galaxy Tab 4', + realMobile: true } }, - browsers: ['bstack_chrome_windows', 'bstack_firefox_windows', 'bstack_ie11_windows', 'bstack_iphoneX'], + browsers: ['bstack_chrome_windows', 'bstack_firefox_windows', 'bstack_ie11_windows', 'bstack_edge_windows', 'bstack_iphoneX', 'bstack_macos_safari', 'bstack_android'], frameworks: ['mocha', 'chai'], reporters: ['dots', 'BrowserStack'], files: [ { pattern: '.build/showdown.js'}, { pattern: 'src/options.js'}, // tests - { pattern: 'test/unit/showdown*.js' }, - { pattern: 'test/functional/showdown*.js' }, + { pattern: 'test/unit/showdown*.js' } + //{ pattern: 'test/functional/showdown*.js' }, ], singleRun: true, concurrency: Infinity