From b774c3e785bc442ee0799bf5faedaf624cd0b3b5 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Mon, 5 Apr 2021 21:25:45 +0200 Subject: [PATCH] Replaced appveyor build badge with one from Github Workflow (#319) * Deleted appveyor.yml * Removed Appveyor check in karma.conf.js * Modified build badge to use Github workflow * Fixed missing parenthesis in README.md --- README.md | 2 +- appveyor.yml | 36 ------------------------------------ spec/support/karma.conf.js | 5 +---- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 appveyor.yml diff --git a/README.md b/README.md index 5096a355f4f..04935e12a07 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/jslib?branch=master&svg=true)](https://ci.appveyor.com/project/bitwarden/jslib) +[![Github Workflow build on master](https://github.com/bitwarden/jslib/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/jslib/actions/workflows/build.yml?query=branch:master) # Bitwarden JavaScript Library diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1ff596d5b00..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,36 +0,0 @@ -image: -- Visual Studio 2017 - -init: -- ps: | - if($isWindows -and $env:DEBUG_RDP -eq "true") { - iex ((new-object net.webclient).DownloadString(` - 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - } -- ps: Install-Product node 10 - -install: -- ps: choco install cloc --no-progress -- ps: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git - -before_build: -- cmd: node --version -- cmd: npm --version - -build_script: -- cmd: npm install -- cmd: npm run lint -- cmd: npm run build -- cmd: npm run test -- cmd: 7z a coverage-%APPVEYOR_BUILD_NUMBER%.zip coverage\* - -on_finish: - - ps: | - if($isWindows -and $env:DEBUG_RDP -eq "true") { - $blockRdp = $true - iex ((new-object net.webclient).DownloadString(` - 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - } - -artifacts: -- path: coverage-%APPVEYOR_BUILD_NUMBER%.zip diff --git a/spec/support/karma.conf.js b/spec/support/karma.conf.js index b9f064f0809..b7ef75ffb05 100644 --- a/spec/support/karma.conf.js +++ b/spec/support/karma.conf.js @@ -82,11 +82,8 @@ module.exports = (config) => { var ci = process.env.CI === 'True' || process.env.CI === 'true'; var githubAction = process.env.GITHUB_WORKFLOW != null && process.env.GITHUB_WORKFLOW !== ''; - var appveyor = process.env.APPVEYOR === 'True'; - if (githubAction || appveyor) { - removeBrowser('Edge'); - } if (githubAction) { + removeBrowser('Edge'); removeBrowser('Firefox'); removeBrowser('Safari'); }