From 047885e220286cdc233ebfa45a00ad171bd6de76 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Wed, 4 Oct 2023 15:46:19 +0100 Subject: [PATCH 1/6] Change agent to mac-os latest --- .github/workflows/build.yml | 6 +++--- .github/workflows/documentation.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c0da71e3..17abd2263 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ env: jobs: build: name: Build - runs-on: ubuntu-latest + runs-on: macOS-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -67,7 +67,7 @@ jobs: publication-verification: name: Publication verification - runs-on: ubuntu-latest + runs-on: macOS-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -162,7 +162,7 @@ jobs: check-documentation: name: Check documentation - runs-on: ubuntu-latest + runs-on: macOS-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index cbfd15320..821706dce 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ on: jobs: deploy: name: Deploy - runs-on: ubuntu-latest + runs-on: macOS-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22314e3e2..8e88414e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: publish: name: Publish - runs-on: ubuntu-latest + runs-on: macOS-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 From 3329fc38e55ed9d809aaa40ee80dae144e05c3e4 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Wed, 4 Oct 2023 17:49:10 +0100 Subject: [PATCH 2/6] Increase JVM memory --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 116d89d9f..064bb50ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,11 +7,11 @@ kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true kotlin.native.enableDependencyPropagation=false library.version=2.0.0-alpha06 org.gradle.caching=true -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx8192m -Dfile.encoding=UTF-8 org.gradle.parallel=true org.jetbrains.compose.experimental.jscanvas.enabled=true kotlin.mpp.stability.nowarn=true kotlin.mpp.enableCInteropCommonization=true org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none \ No newline at end of file +kotlin.native.cacheKind=none From 7b9ce51c1612c20e58f40f775f225450458304b4 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Fri, 6 Oct 2023 18:02:27 +0100 Subject: [PATCH 3/6] Use Xcode version 14 --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17abd2263..9d22383f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,9 @@ jobs: with: distribution: 'zulu' java-version: '17' + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.1' - uses: gradle/wrapper-validation-action@v1 - uses: gradle/gradle-build-action@v2 with: @@ -70,6 +73,9 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.1' - uses: actions/setup-java@v3 with: distribution: 'zulu' @@ -90,7 +96,7 @@ jobs: instrumentation-tests: name: Instrumentation tests - runs-on: macOS-latest + runs-on: ubuntu-latest timeout-minutes: 60 steps: - uses: actions/checkout@v3 @@ -127,7 +133,7 @@ jobs: screenshot-tests: name: Screenshot tests - runs-on: macOS-latest + runs-on: ubuntu-latest timeout-minutes: 60 steps: - uses: actions/checkout@v3 @@ -162,7 +168,7 @@ jobs: check-documentation: name: Check documentation - runs-on: macOS-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 From 5bd9aa550d0da4406288a39238c0b451fd034925 Mon Sep 17 00:00:00 2001 From: Manel Martos Date: Wed, 24 Apr 2024 10:10:24 +0200 Subject: [PATCH 4/6] Use new setup-gradle action instead of deprecated one --- .github/workflows/build.yml | 10 +++++----- .github/workflows/documentation.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dd2aef7e..32f053324 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - name: Build @@ -75,7 +75,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - name: Check publication setup @@ -99,7 +99,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - name: Setup Android SDK @@ -137,7 +137,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - name: Setup Android SDK @@ -171,7 +171,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - name: Generate distributions diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index d3af21c1a..1f68e2d81 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -20,7 +20,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ env.MAIN_BRANCH != 'true' }} - run: pip install mkdocs-material diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9fcc4548..514ca89c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: distribution: 'zulu' java-version: '17' - uses: gradle/wrapper-validation-action@v2 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 env: SIGNING_KEY: ${{ secrets.SIGNING_KEY }} with: From d7c000ec437bbb25e7222d2755c0bff95ee03ed8 Mon Sep 17 00:00:00 2001 From: Manel Martos Date: Wed, 24 Apr 2024 10:16:36 +0200 Subject: [PATCH 5/6] Instrumentation and screenshot workflows should be run on macOS agents --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32f053324..927782213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: category: detekt - name: Upload failure artifacts if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: reports path: | @@ -90,7 +90,7 @@ jobs: instrumentation-tests: name: Instrumentation tests - runs-on: ubuntu-latest + runs-on: macOS-latest timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -119,7 +119,7 @@ jobs: -Dorg.gradle.jvmargs=-Xmx2048m - name: Upload failed instrumentation artifacts if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: instrumentation-failures path: | @@ -128,7 +128,7 @@ jobs: screenshot-tests: name: Screenshot tests - runs-on: ubuntu-latest + runs-on: macOS-latest timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -153,7 +153,7 @@ jobs: -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true - name: Upload failed screenshot artifacts if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: screenshot-failures path: | From d2237e60823bd52577770772c42fdf897677638a Mon Sep 17 00:00:00 2001 From: Manel Martos Date: Wed, 24 Apr 2024 10:36:17 +0200 Subject: [PATCH 6/6] Documentation can run on Linux agents --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 1f68e2d81..e30fd3ac5 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ on: jobs: deploy: name: Deploy - runs-on: macOS-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5