diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 03b3d5c3d..988cf855b 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -5,20 +5,8 @@ name: react-native-android-build-apk on: [push, pull_request] jobs: - pre_job: - if: github.repository == 'laurent22/joplin' - runs-on: ubuntu-latest - outputs: - should_skip: false # ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v5 - with: - concurrent_skipping: 'same_content_newer' - AssembleRelease: - needs: pre_job - if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true' + if: github.repository == 'laurent22/joplin' runs-on: ubuntu-latest steps: - name: Install Linux dependencies diff --git a/.github/workflows/build-macos-m1.yml b/.github/workflows/build-macos-m1.yml index c0b4742c6..8163ee342 100644 --- a/.github/workflows/build-macos-m1.yml +++ b/.github/workflows/build-macos-m1.yml @@ -1,21 +1,9 @@ name: Build macOS M1 on: [push, pull_request] jobs: - pre_job: - if: github.repository == 'laurent22/joplin' - runs-on: ubuntu-latest - outputs: - should_skip: false # ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v5 - with: - concurrent_skipping: 'same_content_newer' - Main: - needs: pre_job # We always process desktop release tags, because they also publish the release - if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/v')) + if: github.repository == 'laurent22/joplin' && (startsWith(github.ref, 'refs/tags/v')) runs-on: macos-latest steps: diff --git a/.github/workflows/github-actions-main.yml b/.github/workflows/github-actions-main.yml index 3f974a279..8931463ba 100644 --- a/.github/workflows/github-actions-main.yml +++ b/.github/workflows/github-actions-main.yml @@ -1,23 +1,9 @@ name: Joplin Continuous Integration on: [push, pull_request] jobs: - pre_job: - if: github.repository == 'laurent22/joplin' - # Do not use unbuntu-latest because it causes `The operation was canceled` failures: - # https://github.com/actions/runner-images/issues/6709 - runs-on: ubuntu-20.04 - outputs: - should_skip: false # ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v5 - with: - concurrent_skipping: 'same_content_newer' - Main: - needs: pre_job # We always process server or desktop release tags, because they also publish the release - if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v')) + if: github.repository == 'laurent22/joplin' && (startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v')) runs-on: ${{ matrix.os }} strategy: matrix: @@ -157,8 +143,7 @@ jobs: yarn install && cd packages/app-desktop && yarn dist --publish=never ServerDockerImage: - needs: pre_job - if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true' + if: github.repository == 'laurent22/joplin' runs-on: ${{ matrix.os }} strategy: matrix: