From 934efc61eb795af5d2f227ee000b572545e851a5 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Fri, 10 Jun 2016 00:07:56 +0900 Subject: [PATCH 1/4] Use electronuserland/electron-builder image in CircleCI --- circle.yml | 6 +++--- docker/Dockerfile | 15 --------------- docker/circle_docker_build.sh | 13 ------------- docker/package_in_docker.sh | 1 - 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 docker/Dockerfile delete mode 100755 docker/circle_docker_build.sh diff --git a/circle.yml b/circle.yml index ce9b0e7a..df7e64d9 100644 --- a/circle.yml +++ b/circle.yml @@ -13,11 +13,9 @@ dependencies: cache_directories: - "~/.electron" - "src/node_modules" - - "~/docker_cache" post: - - ./docker/circle_docker_build.sh - mkdir -p ~/.electron - - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuya-oc/em-builder ./electron-mattermost/docker/package_in_docker.sh + - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electon-builder ./docker/package_in_docker.sh - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32 - mv release/Mattermost-win32-x64 release/mattermost-desktop-win64 - mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx @@ -32,6 +30,8 @@ dependencies: - cp release/windows-installer/mattermost-setup.exe $CIRCLE_ARTIFACTS/ test: + override: + - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electon-builder /test.sh post: - mv test-results.xml $CIRCLE_TEST_REPORTS/ diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index e95af82a..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM suchja/wine:latest -MAINTAINER Yuya Ochiai - -ENV NODE_VERSION=v6.1.0 -ENV PATH=$HOME/.nodebrew/current/bin:$PATH - -USER root -RUN apt-get update && apt-get -y install wget bzip2 zip - -# electron-builder -RUN apt-get update && apt-get -y install ruby ruby-dev gcc make icnsutils graphicsmagick xz-utils && gem install fpm - -USER xclient -# install Node.js -RUN curl -L git.io/nodebrew | perl - setup && nodebrew install-binary $NODE_VERSION && nodebrew use $NODE_VERSION diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh deleted file mode 100755 index 0995e57f..00000000 --- a/docker/circle_docker_build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# execute from source root -set -ex -CACHE_DIR=~/docker_cache -if [ -e ${CACHE_DIR}/em-builder.tar ] && md5sum -c ${CACHE_DIR}/dockerfile.md5sum -then - docker load < ${CACHE_DIR}/em-builder.tar -else - mkdir -p ${CACHE_DIR} - docker build -t yuya-oc/em-builder docker - md5sum docker/Dockerfile > ${CACHE_DIR}/dockerfile.md5sum - docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar -fi diff --git a/docker/package_in_docker.sh b/docker/package_in_docker.sh index 600e39c6..a43eebf1 100755 --- a/docker/package_in_docker.sh +++ b/docker/package_in_docker.sh @@ -1,7 +1,6 @@ #!/bin/sh # This script should be executed in docker container. set -ex -cd electron-mattermost npm run package:all npm run package:linux npm run installer From 3692fcb2fe4812a242e4ff5b5fa4ecf30c744ef2 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Fri, 10 Jun 2016 00:13:23 +0900 Subject: [PATCH 2/4] Fix typo and tag --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index df7e64d9..ca94f340 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ dependencies: - "src/node_modules" post: - mkdir -p ~/.electron - - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electon-builder ./docker/package_in_docker.sh + - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine ./docker/package_in_docker.sh - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32 - mv release/Mattermost-win32-x64 release/mattermost-desktop-win64 - mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx @@ -31,7 +31,7 @@ dependencies: test: override: - - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electon-builder /test.sh + - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /test.sh post: - mv test-results.xml $CIRCLE_TEST_REPORTS/ From d7b7ea238b8c2f3fc640bd66b892421ef7c80fee Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Fri, 10 Jun 2016 00:31:18 +0900 Subject: [PATCH 3/4] Fix directory owner after building --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index ca94f340..93bd9216 100644 --- a/circle.yml +++ b/circle.yml @@ -16,6 +16,7 @@ dependencies: post: - mkdir -p ~/.electron - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine ./docker/package_in_docker.sh + - sudo chown -R ubuntu:ubuntu release - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32 - mv release/Mattermost-win32-x64 release/mattermost-desktop-win64 - mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx From 199a49488f001c4a0bc2641b3aa5720ab38633ba Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Sun, 12 Jun 2016 16:51:00 +0900 Subject: [PATCH 4/4] Revert test command --- circle.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/circle.yml b/circle.yml index 93bd9216..46dde0da 100644 --- a/circle.yml +++ b/circle.yml @@ -31,8 +31,6 @@ dependencies: - cp release/windows-installer/mattermost-setup.exe $CIRCLE_ARTIFACTS/ test: - override: - - docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine /test.sh post: - mv test-results.xml $CIRCLE_TEST_REPORTS/