Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1293642 - Add gyp, ninja-build, pkg-config to Taskcluster Docker …
…image r=me
  • Loading branch information
Tim Taubert committed Aug 9, 2016
1 parent a137b7e commit c1f2aec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions automation/taskcluster/decision_task.yml
Expand Up @@ -57,14 +57,14 @@ tasks:
- "tc-treeherder.v2.{{project}}.{{revision}}.{{pushlog_id}}"

payload:
image: "ttaubert/nss-ci:0.0.20"
image: "ttaubert/nss-ci:0.0.21"

env:
TC_OWNER: {{owner}}
TC_SOURCE: {{{source}}}
TC_PROJECT: {{project}}
TC_COMMENT: '{{comment}}'
TC_IMAGE: "ttaubert/nss-ci:0.0.20"
TC_IMAGE: "ttaubert/nss-ci:0.0.21"
NSS_PUSHLOG_ID: '{{pushlog_id}}'
NSS_HEAD_REPOSITORY: '{{{url}}}'
NSS_HEAD_REVISION: '{{revision}}'
Expand Down
4 changes: 3 additions & 1 deletion automation/taskcluster/docker/setup.sh
Expand Up @@ -15,6 +15,8 @@ apt_packages+=('ca-certificates')
apt_packages+=('curl')
apt_packages+=('npm')
apt_packages+=('git')
apt_packages+=('ninja-build')
apt_packages+=('pkg-config')
apt_packages+=('zlib1g-dev')

# 32-bit builds
Expand Down Expand Up @@ -59,8 +61,8 @@ locale-gen en_US.UTF-8
dpkg-reconfigure locales

# Cleanup.
apt-get autoremove -y && apt-get clean
rm -rf ~/.ccache ~/.cache
apt-get autoremove -y
apt-get clean
apt-get autoclean
rm $0

0 comments on commit c1f2aec

Please sign in to comment.