Merge pull request #42 from yml-org/fix/ci-stuck

Fix CI

Author: osugikoji

.github/workflows/main-ci.yml

@@ -4,56 +4,77 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    branches: '*'
+  workflow_dispatch:
+
+env:
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
 
 jobs:
   code-check:
     name: Code Check
     runs-on: ubuntu-latest
     steps:
-      ## Step 1
       - name: Checkout
         uses: actions/checkout@v3
-      ## Step 2
-      - name: Run Clean
-        run: ./gradlew clean
-      ## Step 3
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Configure JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: wrapper
+
       - name: Check Swift Package Version
         run: ./gradlew checkSwiftPackageVersion
-      ## Step 4
+
       - name: Run Detekt
-        run: ./gradlew :ychat:detektMetadataMain
-      ## Step 5
+        run: ./gradlew detektMetadataMain
+
       - name: Run Ktlint
-        run: ./gradlew :ychat:ktlintCheck
+        run: ./gradlew ktlintCheck
 
   code-coverage:
     name: Code Coverage
     runs-on: ubuntu-latest
     steps:
-      ## Step 1
       - name: Checkout
         uses: actions/checkout@v3
-      ## Step 2
-      - name: Set up Java 11
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Configure JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: '11'
-      ## Step 3
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: wrapper
+
       - name: Run Kover Verify
         run: ./gradlew koverVerify
-      ## Step 4
+
       - name: Upload Test Report
         if: failure()
         uses: actions/upload-artifact@v3
         with:
           name: Test Report
           path: "**/build/reports/tests/testDebugUnitTest"
-      ## Step 5
+
       - name: Run Kover Report
         run: ./gradlew :ychat:koverXmlReport
-      ## Step 6
+
       - name: Upload coverage reports
         uses: codecov/codecov-action@v3
         with:

.github/workflows/publish.yml

@@ -3,21 +3,33 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+
+env:
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false"
+
 jobs:
   publish-maven:
     name: Publish to Maven
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Java for publishing to Maven Central Repository
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Configure JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: gradle
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: wrapper
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Publish to Repository
         run: ./gradlew :ychat:clean publishReleasePublicationToYChatRepository
 

gradle.properties

@@ -1,6 +1,3 @@
-#Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
-
 #Kotlin
 kotlin.code.style=official