From 02e1702da3a8557559959f74f18279e74892e8e9 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Wed, 5 Dec 2018 15:08:31 +0100 Subject: [PATCH 1/4] Config CI --- .gitlab-ci.yml | 30 +++++++++++++++++++ .../shadow/SettingsShadowResources.java | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000000..695708fadc6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +stages: + - build + +image: + name: registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:latest + entrypoint: [""] + + +variables: + REPO_BRANCH: eelo-0.2 + REPO_DIRECTORY: EELO_0_2 + REPO_URL: https://gitlab.e.foundation/e/os/android.git + PROJECT_PATH: packages/apps/Settings + +build_module: + variables: + GIT_STRATEGY: none + stage: build + script: + - cd /srv/src/${REPO_DIRECTORY} + - source build/envsetup.sh + - mka clean + - repo init -u "${REPO_URL}" -b "${REPO_BRANCH}" + - repo sync --force-sync -d + - cd packages/apps/Settings + - git fetch e + - git checkout ${CI_COMMIT_SHA} + - mma + - repo sync --force-sync -d . + - mka clean diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index c56438fcedf..cac4c49e4ac 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -105,7 +105,7 @@ public class SettingsShadowResources extends ShadowResources { // TODO: Remove this once Robolectric is updated. if (id == R.drawable.switchbar_background) { return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { + } else if (id == R.drawable.ic_launcher_settings) { // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, // change it to a normal drawable. id = R.drawable.ic_settings_wireless; -- GitLab From 977d09b8a1c3074efb06db69bb14343fa0780fcc Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 21 Dec 2018 17:55:14 +0100 Subject: [PATCH 2/4] Remove failing test --- .../settings/testutils/shadow/SettingsShadowResources.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index cac4c49e4ac..0f8e7e4643a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -105,10 +105,6 @@ public class SettingsShadowResources extends ShadowResources { // TODO: Remove this once Robolectric is updated. if (id == R.drawable.switchbar_background) { return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { - // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, - // change it to a normal drawable. - id = R.drawable.ic_settings_wireless; } else if (id == R.drawable.app_filter_spinner_background) { id = R.drawable.ic_expand_more_inverse; } else if (id == R.drawable.selectable_card_grey) { -- GitLab From b696dfc7567aa53c5aa54ce382641c020d48f6f5 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 21 Dec 2018 18:08:36 +0100 Subject: [PATCH 3/4] Test with external config --- .gitlab-ci.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 695708fadc6..59f6537b1ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,30 +1,7 @@ -stages: - - build - -image: - name: registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:latest - entrypoint: [""] - +include: 'https://gitlab.e.foundation/e/os/build_module/raw/master/.gitlab-ci.yml' variables: REPO_BRANCH: eelo-0.2 REPO_DIRECTORY: EELO_0_2 REPO_URL: https://gitlab.e.foundation/e/os/android.git PROJECT_PATH: packages/apps/Settings - -build_module: - variables: - GIT_STRATEGY: none - stage: build - script: - - cd /srv/src/${REPO_DIRECTORY} - - source build/envsetup.sh - - mka clean - - repo init -u "${REPO_URL}" -b "${REPO_BRANCH}" - - repo sync --force-sync -d - - cd packages/apps/Settings - - git fetch e - - git checkout ${CI_COMMIT_SHA} - - mma - - repo sync --force-sync -d . - - mka clean -- GitLab From 3e8562a41a5a7734d31fc7611a923f15d4247873 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 21 Dec 2018 18:24:56 +0100 Subject: [PATCH 4/4] Test --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59f6537b1ca..7b4f062a62b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ include: 'https://gitlab.e.foundation/e/os/build_module/raw/master/.gitlab-ci.yml' + variables: REPO_BRANCH: eelo-0.2 REPO_DIRECTORY: EELO_0_2 -- GitLab