From df2b829b15b2b0e202687c6d466fc3a18427a4fa Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 2 Dec 2024 22:06:32 +0100 Subject: [PATCH 1/5] fix publishing ci code --- .../workflows/publish-stable-on-release.yml | 36 +++---------------- build.gradle.kts | 9 ----- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/.github/workflows/publish-stable-on-release.yml b/.github/workflows/publish-stable-on-release.yml index ad186fb9..1d671bb6 100644 --- a/.github/workflows/publish-stable-on-release.yml +++ b/.github/workflows/publish-stable-on-release.yml @@ -34,43 +34,17 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: 21 - - name: Setup Gradle and dependencies - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: wrapper - cache-read-only: false - arguments: ":resolveDependencies -Pkotlin.incremental=false --no-daemon" - gradle-home-cache-excludes: | - caches/modules-2/files-2.1/com.jetbrains.intellij.pycharm - caches/modules-2/files-2.1/com.jetbrains.intellij.idea - caches/modules-2/files-2.1/com.jetbrains.intellij.clion - - - name: Build - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: wrapper - arguments: "assemble testClasses -Pkotlin.incremental=false --no-daemon --stacktrace" - gradle-home-cache-excludes: | - caches/modules-2/files-2.1/com.jetbrains.intellij.pycharm - caches/modules-2/files-2.1/com.jetbrains.intellij.idea - caches/modules-2/files-2.1/com.jetbrains.intellij.clion - - - name: Publish to EAP channel - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: wrapper - arguments: ":publishPlugin -Pkotlin.incremental=false --no-daemon --stacktrace" - gradle-home-cache-excludes: | - caches/modules-2/files-2.1/com.jetbrains.intellij.pycharm - caches/modules-2/files-2.1/com.jetbrains.intellij.idea - caches/modules-2/files-2.1/com.jetbrains.intellij.clion + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Publish plugin + run: ./gradlew publishPlugin --stacktrace -Pkotlin.incremental=false diff --git a/build.gradle.kts b/build.gradle.kts index dbca0ddb..fa5524d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -233,15 +233,6 @@ allprojects { copyDownloadedAptosBinaries(this) } } - - task("resolveDependencies") { - doLast { - rootProject.allprojects - .map { it.configurations } - .flatMap { it.filter { c -> c.isCanBeResolved } } - .forEach { it.resolve() } - } - } } //project(":ui-tests") { From 28e7954b4f7dfad60dac8c02c1391f29b9c2a36b Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 2 Dec 2024 22:13:01 +0100 Subject: [PATCH 2/5] try freeing up space in runners --- .github/workflows/check.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9ce83d23..2f0ebd4f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -21,6 +21,22 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Set up JDK 21 uses: actions/setup-java@v4 with: From 4c36c5ef39b3fbad0be508c3de2dd5dd1d6db6ad Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 2 Dec 2024 22:21:27 +0100 Subject: [PATCH 3/5] free disk space --- .github/workflows/check.yml | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2f0ebd4f..06d8fa84 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,23 +19,22 @@ jobs: ORG_GRADLE_PROJECT_platformType: ${{ matrix.platform-type }} steps: - - uses: actions/checkout@v4 + - name: Free disk space in the runner before build + uses: jlumbroso/free-disk-space@main + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: false + docker-images: false + swap-storage: false - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@main - with: - # this might remove tools that are actually needed, - # if set to "true" but frees about 6 GB - tool-cache: false - - # all of these default to true, but feel free to set to - # "false" if necessary for your workflow - android: true - dotnet: true - haskell: true - large-packages: true - docker-images: true - swap-storage: true + - uses: actions/checkout@v4 - name: Set up JDK 21 uses: actions/setup-java@v4 @@ -57,3 +56,20 @@ jobs: - name: Verify plugin run: ./gradlew verifyPlugin + + - name: Free Disk Space After (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + From ca52e1314117adc38fd123e8deee37e983b505c9 Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 2 Dec 2024 22:31:36 +0100 Subject: [PATCH 4/5] remove old biggest space cloggers --- .github/workflows/check.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 06d8fa84..90eb8c2e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -28,7 +28,6 @@ jobs: # all of these default to true, but feel free to set to # "false" if necessary for your workflow android: true - dotnet: true haskell: true large-packages: false docker-images: false @@ -57,19 +56,3 @@ jobs: - name: Verify plugin run: ./gradlew verifyPlugin - - name: Free Disk Space After (Ubuntu) - uses: jlumbroso/free-disk-space@main - with: - # this might remove tools that are actually needed, - # if set to "true" but frees about 6 GB - tool-cache: false - - # all of these default to true, but feel free to set to - # "false" if necessary for your workflow - android: true - dotnet: true - haskell: true - large-packages: true - docker-images: true - swap-storage: true - From 63c73b3d36b78079c58c11b250f86f8fee0f381b Mon Sep 17 00:00:00 2001 From: Maksim Kurnikov Date: Mon, 2 Dec 2024 22:48:55 +0100 Subject: [PATCH 5/5] free in publishing code too --- .github/workflows/publish-stable-on-release.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/publish-stable-on-release.yml b/.github/workflows/publish-stable-on-release.yml index 1d671bb6..fc2521c0 100644 --- a/.github/workflows/publish-stable-on-release.yml +++ b/.github/workflows/publish-stable-on-release.yml @@ -34,6 +34,20 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Free disk space in the runner before build + uses: jlumbroso/free-disk-space@main + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: true + haskell: true + large-packages: false + docker-images: false + swap-storage: false + - name: Set up JDK 21 uses: actions/setup-java@v4 with: