From 1b60931fc7e86647e4de01d6073ab5cd21cd9747 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 5 Feb 2023 15:22:22 +0100 Subject: [PATCH] Fix workflow YML files --- .github/workflows/fdroid_nightly.yml | 5 ++++- .github/workflows/nightly.yml | 2 +- .github/workflows/pull_request.yml | 15 ++++++++------- .github/workflows/release.yml | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fdroid_nightly.yml b/.github/workflows/fdroid_nightly.yml index 9348c96a4..99f253d1f 100644 --- a/.github/workflows/fdroid_nightly.yml +++ b/.github/workflows/fdroid_nightly.yml @@ -13,17 +13,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: java-version: 11 - distribution: temurin + distribution: temurin + - name: Build run: | # use timestamp as Version Code export versionCode=$(date '+%s') sed -i "s,^\(\s*versionCode\) *[0-9].*,\1 $versionCode," app/build.gradle.kts ./gradlew assembleDebug + - name: fdroid nightly run: | sudo add-apt-repository ppa:fdroid/fdroidserver diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 87ba44e8e..53bb12a45 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 - distribution: temurin + distribution: temurin - name: build debug run: ./gradlew assembleNightly diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 99c4cb272..1b3d1ed18 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,7 +21,8 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 - distribution: temurin + distribution: temurin + - name: Restore Cache uses: actions/cache@v3 with: @@ -58,7 +59,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 - distribution: temurin + distribution: temurin - name: Restore Cache uses: actions/cache@v3 @@ -90,13 +91,13 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - fetch-depth: 1 + fetch-depth: 1 - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 11 - distribution: temurin + java-version: 11 + distribution: temurin - name: Restore Cache uses: actions/cache@v3 @@ -114,8 +115,8 @@ jobs: uses: actions/upload-artifact@v3 if: ${{ always() }} with: - name: lint-report - path: '**/build/reports/lint-results-*' + name: lint-report + path: '**/build/reports/lint-results-*' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1956c17ed..237f61c11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 11 - distribution: temurin + distribution: temurin - name: Decrypt files env: