Merge branch 'dev' into renovate/node-18.x

laurent22 · Nov 3, 2024 · a9d43b9 · a9d43b9
2 parents df5ccba + 50e1c26
commit a9d43b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -6,14 +6,13 @@ jobs:
 
   # This job will make the action fail if any of the checks hasn't passed
   # https://github.com/marketplace/actions/allcheckspassed
-  allchecks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: wechuli/allcheckspassed@v1
+  # allchecks:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: wechuli/allcheckspassed@v1
 
   automerge:
     runs-on: ubuntu-latest
-    needs: allchecks
     permissions:
       contents: write
     steps:

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+      should_skip: false # ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5

diff --git a/.github/workflows/build-macos-m1.yml b/.github/workflows/build-macos-m1.yml
@@ -5,7 +5,7 @@ jobs:
     if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+      should_skip: false # ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5

diff --git a/.github/workflows/github-actions-main.yml b/.github/workflows/github-actions-main.yml
@@ -7,7 +7,7 @@ jobs:
     # https://github.com/actions/runner-images/issues/6709
     runs-on: ubuntu-20.04
     outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+      should_skip: false # ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5