Merge pull request #1757 from djsmith85/cleanup_and_build_badge
Replaced appveyor build badge with one from Github Workflow
This commit is contained in:
commit
9eaee3c44d
|
@ -1,4 +1,4 @@
|
||||||
[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/browser?branch=master&svg=true)](https://ci.appveyor.com/project/bitwarden/browser)
|
[![Github Workflow build on master](https://github.com/bitwarden/browser/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/browser/actions/workflows/build.yml?query=branch:master)
|
||||||
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-browser/localized.svg)](https://crowdin.com/project/bitwarden-browser)
|
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-browser/localized.svg)](https://crowdin.com/project/bitwarden-browser)
|
||||||
[![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby)
|
[![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby)
|
||||||
|
|
||||||
|
|
77
appveyor.yml
77
appveyor.yml
|
@ -1,77 +0,0 @@
|
||||||
image:
|
|
||||||
- Visual Studio 2017
|
|
||||||
|
|
||||||
branches:
|
|
||||||
except:
|
|
||||||
- l10n_master
|
|
||||||
|
|
||||||
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
|
|
||||||
- ps: |
|
|
||||||
$env:PATH = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\;${env:PATH}"
|
|
||||||
$env:DIST_DIR = "${env:APPVEYOR_BUILD_FOLDER}\dist\"
|
|
||||||
$env:DIST_SRC_DIR = "${env:DIST_DIR}Source\"
|
|
||||||
$env:REPO_URL = "https://github.com/${env:APPVEYOR_REPO_NAME}.git"
|
|
||||||
if($env:APPVEYOR_REPO_TAG -eq "true") {
|
|
||||||
$tagName = $env:APPVEYOR_REPO_TAG_NAME.TrimStart("v")
|
|
||||||
$env:RELEASE_NAME = "Version ${tagName}"
|
|
||||||
}
|
|
||||||
|
|
||||||
install:
|
|
||||||
- cmd: npm install -g gulp
|
|
||||||
- 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
|
|
||||||
# Do normal build
|
|
||||||
- cmd: npm run dist
|
|
||||||
- cmd: npm run test
|
|
||||||
- cmd: gulp ci
|
|
||||||
# Build sources for reviewers
|
|
||||||
- cmd: |
|
|
||||||
call git clone --branch=%APPVEYOR_REPO_BRANCH% %REPO_URL% %DIST_SRC_DIR%
|
|
||||||
cd %DIST_SRC_DIR%
|
|
||||||
call git checkout %APPVEYOR_REPO_COMMIT%
|
|
||||||
call git submodule update --init --recursive
|
|
||||||
cd %DIST_DIR%
|
|
||||||
del /S/Q "%DIST_SRC_DIR%.git\objects\pack\*"
|
|
||||||
call 7z a browser-source-%APPVEYOR_BUILD_NUMBER%.zip "%DIST_SRC_DIR%\*"
|
|
||||||
cd %APPVEYOR_BUILD_FOLDER%
|
|
||||||
|
|
||||||
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: dist/dist-opera-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
- path: dist/dist-chrome-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
- path: dist/dist-firefox-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
- path: dist/dist-edge-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
#- path: dist/dist-safari-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
- path: dist/browser-source-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
- path: coverage/coverage-%APPVEYOR_BUILD_NUMBER%.zip
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
tag: $(APPVEYOR_REPO_TAG_NAME)
|
|
||||||
release: $(RELEASE_NAME)
|
|
||||||
provider: GitHub
|
|
||||||
auth_token: $(GH_TOKEN)
|
|
||||||
artifact: /.*/
|
|
||||||
force_update: true
|
|
||||||
on:
|
|
||||||
branch: master
|
|
||||||
APPVEYOR_REPO_TAG: true
|
|
|
@ -1,38 +0,0 @@
|
||||||
# Node.js
|
|
||||||
# Build a general Node.js project with npm.
|
|
||||||
# Add steps that analyze code, save build artifacts, deploy, and more:
|
|
||||||
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
branches:
|
|
||||||
include:
|
|
||||||
- '*'
|
|
||||||
exclude:
|
|
||||||
- l10n_master
|
|
||||||
|
|
||||||
pool:
|
|
||||||
vmImage: 'vs2017-win2016'
|
|
||||||
|
|
||||||
name: $(Rev:r)
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- task: NodeTool@0
|
|
||||||
inputs:
|
|
||||||
versionSpec: '10.x'
|
|
||||||
displayName: 'Install Node.js'
|
|
||||||
|
|
||||||
- powershell: |
|
|
||||||
choco install cloc --no-progress
|
|
||||||
cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
|
|
||||||
displayName: 'Cloc'
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
node --version
|
|
||||||
call npm --version
|
|
||||||
displayName: 'Version checks'
|
|
||||||
|
|
||||||
- script: call npm install
|
|
||||||
displayName: 'npm install'
|
|
||||||
|
|
||||||
- script: call npm run build
|
|
||||||
displayName: 'npm run build'
|
|
|
@ -34,9 +34,7 @@ const filters = {
|
||||||
|
|
||||||
function buildString() {
|
function buildString() {
|
||||||
var build = '';
|
var build = '';
|
||||||
if (process.env.APPVEYOR_BUILD_NUMBER && process.env.APPVEYOR_BUILD_NUMBER !== '') {
|
if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== '') {
|
||||||
build = `-${process.env.APPVEYOR_BUILD_NUMBER}`;
|
|
||||||
} else if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== '') {
|
|
||||||
build = `-${process.env.BUILD_NUMBER}`;
|
build = `-${process.env.BUILD_NUMBER}`;
|
||||||
}
|
}
|
||||||
return build;
|
return build;
|
||||||
|
|
Loading…
Reference in New Issue