From 1eddcd93ca45beb34e1f0376bf2e7d2cf812f7aa Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Thu, 13 Oct 2016 00:09:18 +0200 Subject: [PATCH] [woff2] Do actual checkout in build.sh. Use dummy repo in Jenkinsfile. --- woff2/Jenkinsfile | 4 +++- woff2/build.sh | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/woff2/Jenkinsfile b/woff2/Jenkinsfile index 114765ff4..792e56690 100644 --- a/woff2/Jenkinsfile +++ b/woff2/Jenkinsfile @@ -19,5 +19,7 @@ def libfuzzerBuild = fileLoader.fromGit('infra/libfuzzer-pipeline.groovy', 'master', null, '') libfuzzerBuild { - git = "https://github.com/google/woff2" + // We need to do 'clone --recursive' (to checkout submodules as well). + // The below is just a dummy. Actual checkout is being done in build.sh. + git = "https://github.com/google/oss-fuzz" } diff --git a/woff2/build.sh b/woff2/build.sh index 8a2a7efc3..28cc2fe0a 100755 --- a/woff2/build.sh +++ b/woff2/build.sh @@ -15,14 +15,14 @@ # ################################################################################ -cd /src/woff2 - -# Checkout and update submodules. -git submodule init || true -git submodule update --recursive +# Checkout woff2 repository with submodules. +mkdir -p /work/woff2 +cd /work/woff2 +git clone https://github.com/google/woff2 --recursive # Build the library. Actually there is no 'library' target, so we use .o files. # '-no-canonical-prefixes' flag makes clang crazy. Need to avoid it. +cd woff2 cat brotli/shared.mk | sed -e "s/-no-canonical-prefixes//" \ > brotli/shared.mk.temp mv brotli/shared.mk.temp brotli/shared.mk