Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "added widevine steps to pipeline" #3993

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Revert "added widevine steps to pipeline" #3993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ pipeline {
environment {
GIT_CACHE_PATH = "${HOME}/cache"
SCCACHE_BUCKET = credentials("brave-browser-sccache-mac-s3-bucket")
SIGN_WIDEVINE_CERT = credentials("widevine_brave_prod_cert.der")
SIGN_WIDEVINE_KEY = credentials("widevine_brave_prod_key.pem")
SIGN_WIDEVINE_PASSPHRASE = credentials("447b2fa7-c989-43af-9047-8ae158fad0a3")
}
stages {
stage("checkout") {
Expand Down Expand Up @@ -278,9 +275,6 @@ pipeline {
npm config --userconfig=.npmrc set google_api_endpoint safebrowsing.brave.com
npm config --userconfig=.npmrc set google_api_key dummytoken

mkdir -p src/third_party/widevine/scripts/
cp ${HOME}/signature_generator.py src/third_party/widevine/scripts/

npm run build -- ${BUILD_TYPE} --channel=${CHANNEL} --official_build=true
"""
}
Expand Down Expand Up @@ -393,9 +387,6 @@ pipeline {
KEY_PFX_PATH = "C:\\jenkins\\digicert-key\\digicert.pfx"
AUTHENTICODE_PASSWORD = credentials("digicert-brave-browser-development-certificate-ps-escaped")
AUTHENTICODE_PASSWORD_UNESCAPED = credentials("digicert-brave-browser-development-certificate")
SIGN_WIDEVINE_CERT = credentials("widevine_brave_prod_cert.der")
SIGN_WIDEVINE_KEY = credentials("widevine_brave_prod_key.pem")
SIGN_WIDEVINE_PASSPHRASE = credentials("447b2fa7-c989-43af-9047-8ae158fad0a3")
}
stages {
stage("checkout") {
Expand Down Expand Up @@ -468,9 +459,6 @@ pipeline {
npm config --userconfig=.npmrc set google_api_endpoint safebrowsing.brave.com
npm config --userconfig=.npmrc set google_api_key dummytoken

New-Item -ItemType directory -Path "src\\third_party\\widevine\\scripts"
Copy-Item "C:\\jenkins\\signature_generator.py" -Destination "src\\third_party\\widevine\\scripts\\"

npm run build -- ${BUILD_TYPE} --channel=${CHANNEL} --official_build=true
"""
}
Expand Down Expand Up @@ -606,9 +594,6 @@ pipeline {
KEY_PFX_PATH = "C:\\jenkins\\digicert-key\\digicert.pfx"
AUTHENTICODE_PASSWORD = credentials("digicert-brave-browser-development-certificate-ps-escaped")
AUTHENTICODE_PASSWORD_UNESCAPED = credentials("digicert-brave-browser-development-certificate")
SIGN_WIDEVINE_CERT = credentials("widevine_brave_prod_cert.der")
SIGN_WIDEVINE_KEY = credentials("widevine_brave_prod_key.pem")
SIGN_WIDEVINE_PASSPHRASE = credentials("447b2fa7-c989-43af-9047-8ae158fad0a3")
}
stages {
stage("checkout") {
Expand Down Expand Up @@ -681,9 +666,6 @@ pipeline {
npm config --userconfig=.npmrc set google_api_endpoint safebrowsing.brave.com
npm config --userconfig=.npmrc set google_api_key dummytoken

New-Item -ItemType directory -Path "src\\third_party\\widevine\\scripts"
Copy-Item "C:\\jenkins\\signature_generator.py" -Destination "src\\third_party\\widevine\\scripts\\"

npm run build -- ${BUILD_TYPE} --channel=${CHANNEL} --official_build=true --target_arch=ia32
"""
}
Expand Down
3 changes: 2 additions & 1 deletion lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ const util = {
console.log('signing win binaries...')

const core_dir = config.projects['brave-core'].dir
util.run('python', [path.join(core_dir, 'script', 'sign_binaries.py'), '--build_dir=' + config.outputDir])
util.run('python', [path.join(core_dir, 'script', 'sign_binaries.py'),
'--build_dir=' + path.join(config.srcDir, 'out', 'Release')])
},

generateWidevineSigFiles: () => {
Expand Down