From a9187767fe71fab77221a91ac597bfd920fe1cc0 Mon Sep 17 00:00:00 2001 From: Sid Dange Date: Mon, 13 Jan 2025 18:30:02 -0500 Subject: [PATCH 1/4] point to bp-ubuntu-latest-x64-4x --- .github/workflows/android.yml | 2 +- .github/workflows/diffuse.yml | 4 ++-- .github/workflows/docker.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0e63fceea41..1a37f506e8f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,7 +13,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest-8-cores + runs-on: bp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml index 86afd230400..29dcc6f6f56 100644 --- a/.github/workflows/diffuse.yml +++ b/.github/workflows/diffuse.yml @@ -13,8 +13,8 @@ env: jobs: assemble-base: if: ${{ github.repository != 'signalapp/Signal-Android' }} - runs-on: ubuntu-latest-8-cores - + runs-on: bp-ubuntu-latest-x64-4x  + steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 59b6add10f2..45b3d2c094d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: bp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v3 From 0a35f44de2bc47235acc0606cdbf7c9c37891025 Mon Sep 17 00:00:00 2001 From: Sid Dange Date: Tue, 14 Jan 2025 11:08:07 -0500 Subject: [PATCH 2/4] added circleci --- .circleci/config.yml | 33 +++++++++++++++++++ {.github => .github-old}/FUNDING.yml | 0 .../ISSUE_TEMPLATE/bug_report.yaml | 0 .../ISSUE_TEMPLATE/config.yml | 0 .../PULL_REQUEST_TEMPLATE.md | 0 {.github => .github-old}/stale.yml | 0 .../workflows/android.yml | 0 .../workflows/diffuse.yml | 0 {.github => .github-old}/workflows/docker.yml | 0 9 files changed, 33 insertions(+) create mode 100644 .circleci/config.yml rename {.github => .github-old}/FUNDING.yml (100%) rename {.github => .github-old}/ISSUE_TEMPLATE/bug_report.yaml (100%) rename {.github => .github-old}/ISSUE_TEMPLATE/config.yml (100%) rename {.github => .github-old}/PULL_REQUEST_TEMPLATE.md (100%) rename {.github => .github-old}/stale.yml (100%) rename {.github => .github-old}/workflows/android.yml (100%) rename {.github => .github-old}/workflows/diffuse.yml (100%) rename {.github => .github-old}/workflows/docker.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000000..5a72042dc3e --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,33 @@ +version: 2.1 + +jobs: + test: + resource_class: buildpulse/bp-ubuntu-latest-x64-4x + docker: + - image: cimg/android:2025.01 + steps: + - checkout + + - run: + name: Set up JDK 17 + command: | + sudo apt-get update + sudo apt-get install openjdk-17-jdk + + - run: + name: Build with Gradle + command: ./gradlew qa + + - run: + name: Archive reports for failed build + command: | + if [ $? -ne 0 ]; then + mkdir -p ~/reports + cp -r */build/reports/* ~/reports/ + fi + +workflows: + version: 2 + build-workflow: + jobs: + - test diff --git a/.github/FUNDING.yml b/.github-old/FUNDING.yml similarity index 100% rename from .github/FUNDING.yml rename to .github-old/FUNDING.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github-old/ISSUE_TEMPLATE/bug_report.yaml similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.yaml rename to .github-old/ISSUE_TEMPLATE/bug_report.yaml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github-old/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .github-old/ISSUE_TEMPLATE/config.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github-old/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE.md rename to .github-old/PULL_REQUEST_TEMPLATE.md diff --git a/.github/stale.yml b/.github-old/stale.yml similarity index 100% rename from .github/stale.yml rename to .github-old/stale.yml diff --git a/.github/workflows/android.yml b/.github-old/workflows/android.yml similarity index 100% rename from .github/workflows/android.yml rename to .github-old/workflows/android.yml diff --git a/.github/workflows/diffuse.yml b/.github-old/workflows/diffuse.yml similarity index 100% rename from .github/workflows/diffuse.yml rename to .github-old/workflows/diffuse.yml diff --git a/.github/workflows/docker.yml b/.github-old/workflows/docker.yml similarity index 100% rename from .github/workflows/docker.yml rename to .github-old/workflows/docker.yml From 33a268c368e676526725f937c9d262975178c674 Mon Sep 17 00:00:00 2001 From: Sid Dange Date: Tue, 14 Jan 2025 12:40:06 -0500 Subject: [PATCH 3/4] add caches --- .circleci/config.yml | 12 +++++++++++- gradle.properties | 2 +- gradlew | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a72042dc3e..418b6d4110e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,10 @@ jobs: sudo apt-get update sudo apt-get install openjdk-17-jdk + - restore_cache: + keys: + - my-cache-1 + - run: name: Build with Gradle command: ./gradlew qa @@ -30,4 +34,10 @@ workflows: version: 2 build-workflow: jobs: - - test + - test: + post-steps: # steps to run after steps defined in the job bar + - save_cache: + when: always + key: my-cache-1 + paths: + - .gradle/ diff --git a/gradle.properties b/gradle.properties index 96ec9533d03..8c8db6b6ca3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx12g -Xms256m -XX:MaxMetaspaceSize=1g +org.gradle.jvmargs=-Xmx2g -Xms256m -XX:MaxMetaspaceSize=1g android.useAndroidX=true android.experimental.androidTest.numManagedDeviceShards=4 # We never want to use auto-provisioning, as it breaks reproducible builds. diff --git a/gradlew b/gradlew index 1b6c787337f..69c216d94da 100755 --- a/gradlew +++ b/gradlew @@ -86,7 +86,7 @@ APP_NAME="Gradle" APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='"-Xmx14g" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From 352dcb32c6550d61f94a344132c1748f9c40ada0 Mon Sep 17 00:00:00 2001 From: Sid Dange Date: Tue, 14 Jan 2025 16:01:17 -0500 Subject: [PATCH 4/4] newcache --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 418b6d4110e..6824805503f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: - restore_cache: keys: - - my-cache-1 + - my-cache-2 - run: name: Build with Gradle @@ -38,6 +38,6 @@ workflows: post-steps: # steps to run after steps defined in the job bar - save_cache: when: always - key: my-cache-1 + key: my-cache-2 paths: - .gradle/