Commit Graph

18 Commits

Author SHA1 Message Date
Ravi Mistry
0e440d2ac8 Remove .git directories from the skia checkout in skia-release
This seems to speed up "Build fiddler image" from 57 mins [1] to 26 mins [2].

[1] https://task-driver.skia.org/td/x5NPJ5z9AqvtVwTuDnjY
[2] https://task-driver.skia.org/td/uU5OP2sq9CtPisbHykHh

Bug: skia:12788
Bug: skia:12816
Change-Id: I8ac9af610c14fdad5e6cb8940c80acdbbc09ca8d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/493976
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2022-01-12 19:25:25 +00:00
Ravi Mistry
656986540c Make out/Static/obj accessible for fiddler autodeployment
Required for https://skia-review.googlesource.com/c/buildbot/+/487217

Bug: skia:12788
Change-Id: Idc675c6e1569d52f653c3c08e706e4af1007abd2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/492118
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2022-01-06 21:32:19 +00:00
Ravi Mistry
3b2ff2deb8 Support specifying hash and patch_ref in skia-release & skia-wasm-release Dockerfiles
Bug: skia:10198
Change-Id: If6d47e95ffdbc12f0b31284353d8f48b43cd0041
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287830
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2020-05-06 20:39:04 +00:00
Joe Gregorio
dff41733f9 Revert "fiddle - Don't make warnings into errors."
This reverts commit b2031d4255.

Reason for revert: Breaks fiddle.

Original change's description:
> fiddle - Don't make warnings into errors.
> 
> Bug: skia:
> Change-Id: I01327003aa6a674dda9f8959fa69a386d0c017a8
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/183982
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Ravi Mistry <rmistry@google.com>
> Auto-Submit: Joe Gregorio <jcgregorio@google.com>

TBR=rmistry@google.com,jcgregorio@google.com

Change-Id: If85a7da4a523277208d197dc01e534aec2cc6d67
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269490
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2020-02-07 21:39:38 +00:00
Joe Gregorio
b2031d4255 fiddle - Don't make warnings into errors.
Bug: skia:
Change-Id: I01327003aa6a674dda9f8959fa69a386d0c017a8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/183982
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Auto-Submit: Joe Gregorio <jcgregorio@google.com>
2020-02-07 21:08:27 +00:00
Joe Gregorio
4cb778e367 Fix usage of depot_tools in containers.
depot_tools w/vpython now seems to require the depot_tools dir
to be on PATH, and also python and curl need to be installed.

  * Creates a new base image that has all the build tools we need for
building Skia: skia-build-tools.
  * Moves skia-release to use that new base image.
  * Moves both the skia-release and wasm builds to use fetch and gclient sync.
  * Changes gcr.io/skia-public/emsdk-base:prod to depend on skia-build-tools.


Bug: skia:993053
Change-Id: Ib6218d8c18dd59d43de84dcf063f204cfc8556d0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248556
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2019-10-14 19:38:40 +00:00
Joe Gregorio
2b1a25a4d3 Fix Cloud Build for vpython.
Bug: 993053
Change-Id: I9af5bbf7c715701ba403e2b7ab2e720a1792fb0c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247149
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-10-08 23:43:33 +00:00
Joe Gregorio
df2726ee7a Revert "Another attempt to fix vpython in Cloud Build."
This reverts commit e7bc084498.

Reason for revert: Broke fiddle.

Original change's description:
> Another attempt to fix vpython in Cloud Build.
> 
> I think the underlying issue is switching to the 'skia' user
> to do the build. Instead let's try building as root and then
> chown the generated files which are then used by subsequent
> Dockerfiles.
> 
> Bug:993053
> Change-Id: I314a6c83f70e611ec0fafe93ae136d218d153cfb
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247107
> Reviewed-by: Joe Gregorio <jcgregorio@google.com>
> Commit-Queue: Joe Gregorio <jcgregorio@google.com>

TBR=borenet@google.com,jcgregorio@google.com

Change-Id: I2e0968bc032a2c7716d95d51ba598d94fc67f1ca
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 993053
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247143
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-10-08 22:44:23 +00:00
Joe Gregorio
e7bc084498 Another attempt to fix vpython in Cloud Build.
I think the underlying issue is switching to the 'skia' user
to do the build. Instead let's try building as root and then
chown the generated files which are then used by subsequent
Dockerfiles.

Bug:993053
Change-Id: I314a6c83f70e611ec0fafe93ae136d218d153cfb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247107
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-10-08 20:08:02 +00:00
Joe Gregorio
1494a7f1ec Revert "cloud-build: set HOME env variable."
This reverts commit b51a0c9a5b.

Reason for revert: Causes Cloud Build to fail: https://pantheon.corp.google.com/cloud-build/builds/933b93f5-1ceb-48d0-9f13-55e8b01b3e44?organizationId=433637338589&project=skia-public

Original change's description:
> cloud-build: set HOME env variable.
> 
> Bug: 993053
> Change-Id: I6069def4a063dbe7a4f8c6fe9cc5046d014e4f3c
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247046
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Joe Gregorio <jcgregorio@google.com>

TBR=borenet@google.com,jcgregorio@google.com

Change-Id: I311fe7240768ef0bf7015bdf0cd5a0e2aabe6c5c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 993053
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247051
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-10-08 17:47:42 +00:00
Joe Gregorio
b51a0c9a5b cloud-build: set HOME env variable.
Bug: 993053
Change-Id: I6069def4a063dbe7a4f8c6fe9cc5046d014e4f3c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247046
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-10-08 17:00:21 +00:00
Joe Gregorio
710b5e616e Fix HOME directory in Docker containers built under cloudbuild.
The line:
    USER skia

also sets the $HOME environment variable to /home/skia unless
useradd is given another directory to use as the user's home
directory. So HOME was set to /home/skia, but that directory
doesn't exist in subsequent containers.

Bug: chromuim:993053
Change-Id: I3525d7cf11a1c1e5559cf9216c3bf6071a236949
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244116
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2019-09-26 02:31:35 +00:00
Mike Klein
d5555c88e5 fix Dockerfile?
Change-Id: I5cd133f9de490340a958403c06ab1c8c44017001
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223186
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
2019-06-24 16:34:59 +00:00
Mike Klein
6bbeb4ab72 remove xbyak
For now, disable the vpmovusdb AVX-512 instruction, using the compound
AVX2 fallback instead.  I need to learn how to encode EVEX prefixes
before we can use that, and it's not very important.

That's everything!  We're fully in control now, and should be able to
run this on any x86-64 Linux or Mac.  And we can relax some of the
defined(SKVM_JIT) guards so that, e.g., we can unit test Assembler even
on all platforms.

Stifle some warnings about ~bool by ~(int)bool.

Would like to enable when is_mac too but can't seem to get past
(bogus?) thread annotation on the bots.  My local Mac is fine. :/

Change-Id: If00bdd97ebd9684ed109933e2fa70c5e6f6ea339
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222631
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
2019-06-22 00:16:38 +00:00
Eric Boren
34d63e6b4e [infra] Fix Cloud Build
Bug: skia:9184
Change-Id: Ia78094f5bd2a0cf3c8368933b3719df01ab1e646
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221540
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2019-06-18 14:45:24 +00:00
Joe Gregorio
fba19c37f5 docker - Record the skia git hash.
Puts the git hash in an easy place for dependent docker files to retrieve it from.

Bug: skia:
Change-Id: I096c25554df76779b088d6aab91ddce31304ffde
Reviewed-on: https://skia-review.googlesource.com/136067
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2018-06-20 14:19:01 +00:00
Joe Gregorio
8e9810ce0f [fiddle] Init gpu using the GLTestContext.
The previous way was failing with SwiftShader.

Bug: skia:
Change-Id: I6f3937d4d3bc36851476e29be891dc0a38871ef0
Reviewed-on: https://skia-review.googlesource.com/130325
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-29 18:20:46 +00:00
Joe Gregorio
ca8b0bd237 Fix Dockerfile so args.gn actually applies, also drop debug symbols.
The part of the Dockerfile that extracted the skiaserve executable
will be done in the skiabot repo.

Bug: skia:
Change-Id: Ieb913908d92626a7b9e68649b5c56b8f92646fd2
Reviewed-on: https://skia-review.googlesource.com/130323
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
2018-05-28 18:58:45 +00:00