Revert "wf pr.yml: arc-runner-set (#813)"

This reverts commit b31e852.
flipperdevices · Apr 12, 2024 · 9fffb4c · 9fffb4c
1 parent 8a7dd55
commit 9fffb4c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 61 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -3,61 +3,55 @@ name: Pull Request CI
 on:
   pull_request:
     branches:
-      - "dev"
+      - 'dev'
   merge_group:
 
 jobs:
   test:
     name: "Run unit tests"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: Unit test
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
           arguments: testDebug
   detekt:
     name: "Check project by detekt"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: detekt
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
           arguments: detekt
   android_lint:
     name: "Check project by android`s lint"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: Android lint
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
-          arguments: lint
+          arguments: lint
diff --git a/.github/workflows/pr_gradle.yml b/.github/workflows/pr_gradle.yml
@@ -3,64 +3,58 @@ name: Check configuration change
 on:
   pull_request:
     paths:
-      - "**.gradle.kts"
-      - "build-logic/**"
-      - "gradle/**"
-      - "gradle.properties"
+      - '**.gradle.kts'
+      - 'build-logic/**'
+      - 'gradle/**'
+      - 'gradle.properties'
   merge_group:
 
 jobs:
   release_build:
     name: "Build release"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: Build release
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
           arguments: assembleRelease bundleRelease
   debug_build:
     name: "Build debug"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: Build debug
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
           arguments: assembleDebug bundleDebug
   internal_build:
     name: "Build internal"
-    runs-on: arc-runner-set
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: "temurin"
-          java-version: "17"
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3.2.1
+          distribution: 'temurin'
+          java-version: '17'
       - name: Build internal
-        uses: gradle/actions/setup-gradle@v3.2.1
+        uses: gradle/gradle-build-action@bdf99f9dada2506e990bac6de8ec5e3de34a04f1 # v3
         with:
-          arguments: assembleInternal bundleInternal
+          arguments: assembleInternal bundleInternal