Merge pull request #12351 from electron/update-to-node8

Update CI to use Node.js 8
This commit is contained in:
John Kleinschmidt 2018-03-19 11:04:52 -04:00 committed by GitHub
commit 6b80865bfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 14 deletions

View file

@ -3,7 +3,7 @@ version: 2
jobs: jobs:
electron-linux-arm: electron-linux-arm:
docker: docker:
- image: electronbuilds/electron:0.0.6 - image: electronbuilds/electron:0.0.7
environment: environment:
TARGET_ARCH: arm TARGET_ARCH: arm
resource_class: 2xlarge resource_class: 2xlarge
@ -96,7 +96,7 @@ jobs:
fi fi
electron-linux-arm64: electron-linux-arm64:
docker: docker:
- image: electronbuilds/electron:0.0.6 - image: electronbuilds/electron:0.0.7
environment: environment:
TARGET_ARCH: arm64 TARGET_ARCH: arm64
resource_class: 2xlarge resource_class: 2xlarge
@ -189,7 +189,7 @@ jobs:
fi fi
electron-linux-ia32: electron-linux-ia32:
docker: docker:
- image: electronbuilds/electron:0.0.4 - image: electronbuilds/electron:0.0.7
environment: environment:
TARGET_ARCH: ia32 TARGET_ARCH: ia32
DISPLAY: ':99.0' DISPLAY: ':99.0'
@ -278,7 +278,7 @@ jobs:
path: junit path: junit
electron-linux-mips64el: electron-linux-mips64el:
docker: docker:
- image: electronbuilds/electron:0.0.6 - image: electronbuilds/electron:0.0.7
environment: environment:
TARGET_ARCH: mips64el TARGET_ARCH: mips64el
resource_class: xlarge resource_class: xlarge
@ -336,7 +336,7 @@ jobs:
electron-linux-x64: electron-linux-x64:
docker: docker:
- image: electronbuilds/electron:0.0.6 - image: electronbuilds/electron:0.0.7
environment: environment:
TARGET_ARCH: x64 TARGET_ARCH: x64
DISPLAY: ':99.0' DISPLAY: ':99.0'

View file

@ -7,7 +7,7 @@ ENV HOME=/home
RUN chmod a+rwx /home RUN chmod a+rwx /home
# Install node.js # Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update && apt-get install -y nodejs RUN apt-get update && apt-get install -y nodejs
# Install wget used by crash reporter # Install wget used by crash reporter

View file

@ -46,7 +46,7 @@ RUN apt-get update && apt-get install -y\
xvfb xvfb
# Install node.js # Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update && apt-get install -y nodejs RUN apt-get update && apt-get install -y nodejs
# Install crcmod # Install crcmod

View file

@ -29,13 +29,8 @@ RUN apt-get update && apt-get install -y\
wget \ wget \
xvfb xvfb
# Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get update && apt-get install -y nodejs
ADD tools/xvfb-init.sh /etc/init.d/xvfb ADD tools/xvfb-init.sh /etc/init.d/xvfb
RUN chmod a+x /etc/init.d/xvfb RUN chmod a+x /etc/init.d/xvfb
ADD tools/run-electron.sh /run-electron.sh ADD tools/run-electron.sh /run-electron.sh
RUN chmod a+x /run-electron.sh RUN chmod a+x /run-electron.sh
CMD sh /run-electron.sh CMD sh /run-electron.sh

View file

@ -3,7 +3,7 @@ FROM electronbuilds/libchromiumcontent:0.0.4
USER root USER root
# Install node.js # Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update && apt-get install -y nodejs RUN apt-get update && apt-get install -y nodejs
# Install wget used by crash reporter # Install wget used by crash reporter

View file

@ -1,13 +1,14 @@
pipeline { pipeline {
agent { agent {
docker { docker {
image 'electronbuilds/arm64v8:0.0.1' image 'electronbuilds/arm64v8:0.0.2'
args '--privileged' args '--privileged'
} }
} }
environment { environment {
TARGET_ARCH='arm64' TARGET_ARCH='arm64'
DISPLAY=':99.0' DISPLAY=':99.0'
MOCHA_TIMEOUT='60000'
} }
stages { stages {
stage('Bootstrap') { stage('Bootstrap') {