update build actions

icemachined · Oct 26, 2023 · dd0d0d1 · dd0d0d1
1 parent b413602
commit dd0d0d1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - 'main1'
+      - 'main'
 
 jobs:
   build_and_test_with_code_coverage:
@@ -15,16 +15,15 @@ jobs:
         os: [ ubuntu-20.04, windows-latest, macos-latest ]
 
     steps:
-      # actions/checkout v1.* is needed for correct codecov upload, see https://github.com/actions/checkout/issues/237 for details
-      - uses: actions/checkout@v1
-      # ensure that gradle wrapper files in repository are valid by checking checksums
-      - uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-konan
@@ -42,15 +41,14 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         run: |
           brew install librdkafka
-      - name: Gradle build with remote cache
-        uses: burrunan/gradle-cache-action@v1
+      - name: Gradle build
+        uses: gradle/gradle-build-action@v2
         with:
+          gradle-version: wrapper
+          cache-disabled: true
           arguments: |
             build
             -x detekt
-          properties: |
-            org.gradle.caching=true
-          gradle-version: wrapper
       - name: Upload gradle reports
         if: ${{ always() }}
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -1,8 +1,8 @@
 name: cleanup caches by a branch
 on:
   pull_request:
-    branches:
-      - 'main'
+    types:
+      - closed
 
 jobs:
   cleanup:

diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
@@ -2,7 +2,7 @@ name: Run deteKT
 
 on:
   push:
-    branches: [ main1 ]
+    branches: [ main ]
   pull_request:
 
 jobs:
@@ -12,18 +12,17 @@ jobs:
       GRADLE_OPTS: -Dorg.gradle.daemon=false
 
     steps:
-      - uses: actions/checkout@v2.3.3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
-      - name: Gradle build with remote cache
-        uses: burrunan/gradle-cache-action@v1
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+      - name: Gradle build
+        uses: gradle/gradle-build-action@v2
         with:
-          arguments: detektAll
-          properties: |
-            org.gradle.caching=true
           gradle-version: wrapper
-          # additional files to calculate key for dependency cache
-          gradle-dependencies-cache-key: |
-            buildSrc/**/Versions.kt
+          cache-disabled: true
+          arguments: detektAll
+
diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml
@@ -2,7 +2,7 @@ name: Run diKTat
 
 on:
   push:
-    branches: [ main1 ]
+    branches: [ main ]
   pull_request:
 
 jobs:
@@ -12,15 +12,18 @@ jobs:
       GRADLE_OPTS: -Dorg.gradle.daemon=false
 
     steps:
-      - uses: actions/checkout@v2.4.0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-          distribution: zulu
-      - uses: gradle/gradle-build-action@v2
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+      - name: Gradle build
+        uses: gradle/gradle-build-action@v2
         with:
           gradle-version: wrapper
+          cache-disabled: true
           arguments: |
             diktatCheck
             -Pdiktat.githubActions=true