mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #11342 from electron/add-python-dbusmock

Browse source 
Enable testing with python-dbusmock
This commit is contained in:
Cheng Zhao 2017-12-06 15:02:27 +09:00 • committed by GitHub
commit d8610a3f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.circleci/config.yml
View file

@ -3,7 +3,7 @@ version: 2
jobs:
electron-linux-arm:
docker:
- image: electronbuilds/electron:0.0.3
- image: electronbuilds/electron:0.0.4
environment:
TARGET_ARCH: arm
resource_class: 2xlarge
@ -60,7 +60,7 @@ jobs:
fi
electron-linux-arm64:
docker:
- image: electronbuilds/electron:0.0.3
- image: electronbuilds/electron:0.0.4
environment:
TARGET_ARCH: arm64
resource_class: 2xlarge
@ -117,7 +117,7 @@ jobs:
fi
electron-linux-ia32:
docker:
- image: electronbuilds/electron:0.0.3
- image: electronbuilds/electron:0.0.4
environment:
TARGET_ARCH: ia32
resource_class: xlarge
@ -174,7 +174,7 @@ jobs:
fi
electron-linux-mips64el:
docker:
- image: electronbuilds/electron:0.0.3
- image: electronbuilds/electron:0.0.4
environment:
TARGET_ARCH: mips64el
resource_class: xlarge
@ -232,7 +232,7 @@ jobs:
electron-linux-x64:
docker:
- image: electronbuilds/electron:0.0.3
- image: electronbuilds/electron:0.0.4
environment:
TARGET_ARCH: x64
DISPLAY: ':99.0'

7
Dockerfile
View file

@ -8,10 +8,13 @@ RUN chmod a+rwx /home
# Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get update && apt-get install -y --force-yes nodejs
RUN apt-get update && apt-get install -y nodejs
# Install wget used by crash reporter
RUN apt-get install -y --force-yes wget
RUN apt-get install -y wget
# Install python-dbusmock
RUN apt-get install -y python-dbusmock
# Add xvfb init script
ADD tools/xvfb-init.sh /etc/init.d/xvfb

7
Dockerfile.circleci
View file

@ -4,10 +4,13 @@ USER root
# Install node.js
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get update && apt-get install -y --force-yes nodejs
RUN apt-get update && apt-get install -y nodejs
# Install wget used by crash reporter
RUN apt-get install -y --force-yes wget
RUN apt-get install -y wget
# Install python-dbusmock
RUN apt-get install -y python-dbusmock
# Add xvfb init script
ADD tools/xvfb-init.sh /etc/init.d/xvfb