From 274ce9da4c2edd10e6a4988d121e7aace5084eb4 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 22:26:25 +0800 Subject: [PATCH 1/6] add docker test to circle-ci --- .circleci/config.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef827f006244..cff7a1b83c63 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,6 +139,15 @@ aliases: requires: - checkout_code + - &test-docker-build + machine: true + filters: *filter-ignore-gh-pages + steps: + - checkout + - npx envinfo@latest + - yarn run docker-setup-android + - yarn run docker-build-android + # ------------------------- # DEFAULTS # ------------------------- @@ -157,7 +166,7 @@ js_defaults: &js_defaults android_defaults: &android_defaults <<: *defaults docker: - - image: reactnativecommunity/react-native-android:2019-1-19 + - image: reactnativecommunity/react-native-android:2019-1-19 resource_class: "large" environment: - TERM: "dumb" @@ -592,6 +601,7 @@ workflows: - test_android: *run-after-checkout - test_ios: *run-after-checkout - test_detox_end_to_end: *run-after-checkout + - test_docker_build: *test-docker-build releases: jobs: From 978bfc349f369d505804212a7b6534c014697901 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 22:54:14 +0800 Subject: [PATCH 2/6] refactor location --- .circleci/config.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cff7a1b83c63..90a986573798 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,15 +139,6 @@ aliases: requires: - checkout_code - - &test-docker-build - machine: true - filters: *filter-ignore-gh-pages - steps: - - checkout - - npx envinfo@latest - - yarn run docker-setup-android - - yarn run docker-build-android - # ------------------------- # DEFAULTS # ------------------------- @@ -517,7 +508,19 @@ jobs: - store_test_results: path: ~/react-native/reports/junit - + + # ------------------------- + # JOBS: Test Docker Build + # ------------------------- + test-docker-build: + machine: true + filters: *filter-ignore-gh-pages + steps: + - checkout + - npx envinfo@latest + - yarn run docker-setup-android + - yarn run docker-build-android + - # ------------------------- # JOBS: Coverage # ------------------------- @@ -601,7 +604,7 @@ workflows: - test_android: *run-after-checkout - test_ios: *run-after-checkout - test_detox_end_to_end: *run-after-checkout - - test_docker_build: *test-docker-build + - test_docker_build releases: jobs: From aafe649014ac866e21762ce5f096f88e5b0a4249 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 22:58:36 +0800 Subject: [PATCH 3/6] fix steps --- .circleci/config.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90a986573798..5fb27af731e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -514,13 +514,15 @@ jobs: # ------------------------- test-docker-build: machine: true - filters: *filter-ignore-gh-pages steps: - checkout - - npx envinfo@latest - - yarn run docker-setup-android - - yarn run docker-build-android - - + - run: npx envinfo@latest + - run: + name: Build Android RNTester App + command: | + yarn run docker-setup-android + yarn run docker-build-android + # ------------------------- # JOBS: Coverage # ------------------------- From 90ec7b41f9199da9825f2325536fcc45486b0846 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 23:02:12 +0800 Subject: [PATCH 4/6] typo fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5fb27af731e9..35c1f6fcdaf4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -512,7 +512,7 @@ jobs: # ------------------------- # JOBS: Test Docker Build # ------------------------- - test-docker-build: + test_docker_build: machine: true steps: - checkout From fd66abe7ccede4b6958631637299a70097c913f7 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 23:07:10 +0800 Subject: [PATCH 5/6] hack circle ci --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35c1f6fcdaf4..372fa5619891 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -516,10 +516,13 @@ jobs: machine: true steps: - checkout - - run: npx envinfo@latest - run: name: Build Android RNTester App command: | + source ~/.bashrc + nvm i node + npm i -g yarn + npx envinfo@latest yarn run docker-setup-android yarn run docker-build-android From 538867963aae7ab8685a4f0a16b97df27421f7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <165856+hramos@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:51:16 -0700 Subject: [PATCH 6/6] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 372fa5619891..ba0cebab2768 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -517,7 +517,7 @@ jobs: steps: - checkout - run: - name: Build Android RNTester App + name: Build Docker container for Android RNTester App command: | source ~/.bashrc nvm i node