From f546b128bccfb0f0c72f4099debf8ded10fba825 Mon Sep 17 00:00:00 2001 From: Simonas Sankauskas Date: Sat, 9 May 2026 21:12:14 +0300 Subject: [PATCH] Update CI --- .github/workflows/deploy.yml | 6 +++--- .../workflows/gradle-wrapper-validation.yml | 3 +-- .github/workflows/post-merge.yaml | 8 ++++---- .github/workflows/pre-merge.yaml | 18 ++++++++---------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8049fbd..f1f3643 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,14 +11,14 @@ jobs: if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} steps: - name: Checkout Repo - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v4.1.0 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v3.1.0 + uses: gradle/actions/setup-gradle@v4 - name: Replace Example Content env: DATA_FETCH_GH_TOKEN: ${{ secrets.DATA_FETCH_GH_TOKEN }} diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index d980a56..e9288a9 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -13,7 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout latest code - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 - diff --git a/.github/workflows/post-merge.yaml b/.github/workflows/post-merge.yaml index 001a65f..1a20bd6 100644 --- a/.github/workflows/post-merge.yaml +++ b/.github/workflows/post-merge.yaml @@ -1,4 +1,4 @@ -name: Pre Merge Checks +name: Post Merge Checks on: push: @@ -11,14 +11,14 @@ jobs: if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} steps: - name: Checkout Repo - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v4.1.0 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v3.1.0 + uses: gradle/actions/setup-gradle@v4 - name: Replace Example Content env: DATA_FETCH_GH_TOKEN: ${{ secrets.DATA_FETCH_GH_TOKEN }} diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index fa639f8..d1f1fa4 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -3,37 +3,35 @@ name: Pre Merge Checks on: pull_request: branches: - - '*' + - main jobs: static-analysis: runs-on: ubuntu-latest - if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} steps: - name: Checkout Repo - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v4.1.0 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v3.1.0 + uses: gradle/actions/setup-gradle@v4 - name: Static Analysis run: ./gradlew detekt lint tests: runs-on: ubuntu-latest - if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} steps: - name: Checkout Repo - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v4.1.0 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v3.1.0 + uses: gradle/actions/setup-gradle@v4 - name: Compile Sources # Sanity check before proceeding to tests. run: ./gradlew compileDebugAndroidTestSources compileDebugSources compileDebugUnitTestSources compileReleaseSources @@ -42,4 +40,4 @@ jobs: FLANK_SERVICE_ACCOUNT_KEY: ${{ secrets.FLANK_SERVICE_ACCOUNT_KEY }} run: echo $FLANK_SERVICE_ACCOUNT_KEY | base64 -d > app/flank-service-account-key.json - name: Run Tests - run: ./gradlew testDebugUnitTest flankRun --continue \ No newline at end of file + run: ./gradlew testDebugUnitTest flankRun --continue