From 475486a7e63e40126d395121bc164c36e543993a Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 7 May 2021 16:24:08 -0400 Subject: [PATCH 1/6] Use container isolation --- .cirrus.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ce66e06..796606d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,9 +1,17 @@ task: name: Build - persistent_worker: {} + persistent_worker: + isolation: + container: + image: apon77/aosp:latest + cpu: 8 + memory: 40G + volumes: + - /tmp/mido-AospExtended-Apon77:/tmp/mido-AospExtended-Apon77 + - /home/ci/.ccache:/home/cirrus/.ccache env: USE_CCACHE: 1 - CIRRUS_WORKING_DIR: /tmp/$CIRRUS_REPO_NAME + CIRRUS_WORKING_DIR: /tmp/mido-AospExtended-Apon77 clone_script: - repo init --depth=1 -u git://github.com/AospExtended/manifest.git -b 11.x || true sync_script: From 96f855f85e2e62049f3668b8b33cdbee201136d2 Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 7 May 2021 16:42:18 -0400 Subject: [PATCH 2/6] Fixed paths --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 796606d..55fa36e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ task: memory: 40G volumes: - /tmp/mido-AospExtended-Apon77:/tmp/mido-AospExtended-Apon77 - - /home/ci/.ccache:/home/cirrus/.ccache + - /home/cirrus/.ccache:/home/ci/.ccache env: USE_CCACHE: 1 CIRRUS_WORKING_DIR: /tmp/mido-AospExtended-Apon77 From 7ae73bf570aab9824f7d29e7b47c06d4ea483dcc Mon Sep 17 00:00:00 2001 From: fedor Date: Sun, 9 May 2021 20:33:17 -0400 Subject: [PATCH 3/6] No ccache --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 55fa36e..4ff2695 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,6 @@ task: memory: 40G volumes: - /tmp/mido-AospExtended-Apon77:/tmp/mido-AospExtended-Apon77 - - /home/cirrus/.ccache:/home/ci/.ccache env: USE_CCACHE: 1 CIRRUS_WORKING_DIR: /tmp/mido-AospExtended-Apon77 From e4ae04c3fe83b2eb2d2120f0f8cd26110c105315 Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Sun, 9 May 2021 21:28:41 -0400 Subject: [PATCH 4/6] ccache --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 4ff2695..55fa36e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,7 @@ task: memory: 40G volumes: - /tmp/mido-AospExtended-Apon77:/tmp/mido-AospExtended-Apon77 + - /home/cirrus/.ccache:/home/ci/.ccache env: USE_CCACHE: 1 CIRRUS_WORKING_DIR: /tmp/mido-AospExtended-Apon77 From 84c37deae883245833ea038b0b023c87f5a8ceb9 Mon Sep 17 00:00:00 2001 From: fedor Date: Sun, 9 May 2021 22:48:11 -0400 Subject: [PATCH 5/6] Cleanup archives after uploading --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 55fa36e..569ed7d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -31,3 +31,4 @@ task: } up out/target/product/mido/*.zip + rm out/target/product/mido/*.zip From 49182f316e93d328a14c25a2c7b6ea100c9619a9 Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Sun, 9 May 2021 23:17:05 -0400 Subject: [PATCH 6/6] Update .cirrus.yml --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 569ed7d..5ddb8f5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,6 @@ task: upload_script: | up() { curl --upload-file $1 https://transfer.sh/$(basename $1); echo - # 14 days, 10 GB limit } up out/target/product/mido/*.zip