Skip to content

Commit

Permalink
Fix workflow deprecations (#336)
Browse files Browse the repository at this point in the history
  • Loading branch information
boswelja authored Mar 29, 2024
1 parent dd7eaab commit a73de00
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 25 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/build-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,34 @@ jobs:
environment: nightly
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v3.9.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Prepare signing keystore
uses: mobiledevops/secret-to-file-action@v1
id: write-keystore
uses: timheuer/base64-to-file@v1
with:
base64-encoded-secret: ${{ secrets.KEYSTORE_CONTENT }}
encodedString: ${{ secrets.KEYSTORE_CONTENT }}
filename: "keystore.jks"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2.7.0
uses: gradle/actions/setup-gradle@v3

- name: Build
run: ./gradlew assembleRelease
env:
ORG_GRADLE_PROJECT_storeFilePath: "../keystore.jks"
ORG_GRADLE_PROJECT_storeFilePath: ${{ steps.write-keystore.outputs.filePath }}
ORG_GRADLE_PROJECT_storePass: ${{ secrets.KEYSTORE_PASSWORD }}
ORG_GRADLE_PROJECT_key: ${{ secrets.KEY_ALIAS }}
ORG_GRADLE_PROJECT_keyPass: ${{ secrets.KEY_PASSWORD }}

- name: Upload nightly
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nasdroid-nightly
path: app/build/outputs/apk/release/app-release.apk
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/code-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v3.9.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Setup Gradle
uses: gradle/gradle-build-action@v2.7.0
uses: gradle/actions/setup-gradle@v3

- name: Run Detekt & Lint
continue-on-error: true
run: ./gradlew detektDebug lint --continue

- name: Upload SARIF binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sarif-reports
path: '**/*.sarif'
Expand Down Expand Up @@ -60,10 +64,11 @@ jobs:
- app
steps:
- name: Download scan results
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: sarif-reports
- uses: github/codeql-action/upload-sarif@v2

- uses: github/codeql-action/upload-sarif@v3
continue-on-error: true
with:
sarif_file: ${{ matrix.path }}/
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v3.9.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Setup Gradle
uses: gradle/gradle-build-action@v2.7.0
uses: gradle/actions/setup-gradle@v3

- name: Build
run: ./gradlew assemble${{ matrix.variant }} --scan

Expand All @@ -36,13 +39,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v3.9.0
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin

- name: Setup Gradle
uses: gradle/gradle-build-action@v2.7.0
uses: gradle/actions/setup-gradle@v3

- name: Run Unit Tests
run: ./gradlew ${{ matrix.module }}:test${{ matrix.variant }}UnitTest
2 changes: 1 addition & 1 deletion .github/workflows/pr-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/labeler@v4
with:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ jobs:
distribution: temurin

- name: Prepare signing keystore
uses: mobiledevops/secret-to-file-action@v1
id: write-keystore
uses: timheuer/base64-to-file@v1
with:
base64-encoded-secret: ${{ secrets.KEYSTORE_CONTENT }}
encodedString: ${{ secrets.KEYSTORE_CONTENT }}
filename: "keystore.jks"

- name: Setup Gradle
Expand All @@ -34,7 +35,7 @@ jobs:
- name: Build
run: ./gradlew assembleRelease bundleRelease
env:
ORG_GRADLE_PROJECT_storeFilePath: "../keystore.jks"
ORG_GRADLE_PROJECT_storeFilePath: ${{ steps.write-keystore.outputs.filePath }}
ORG_GRADLE_PROJECT_storePass: ${{ secrets.KEYSTORE_PASSWORD }}
ORG_GRADLE_PROJECT_key: ${{ secrets.KEY_ALIAS }}
ORG_GRADLE_PROJECT_keyPass: ${{ secrets.KEY_PASSWORD }}
Expand All @@ -61,13 +62,13 @@ jobs:

- name: Calculate release version
id: calculate-version
run: echo "::set-output name=version::$(date +'%Y.%-m')"
run: echo "version=$(date +'%Y.%-W')" >> $GITHUB_OUTPUT

- name: Create GitHub Release
uses: ncipollo/release-action@v1
with:
tag: ${{ steps.calculate-version.outputs.version }}
artifacts: "app-release.apk,app-release.aab"
artifacts: "apk/release/app-release.apk,bundle/release/app-release.aab"
prerelease: ${{ github.event.inputs.prerelease }}
makeLatest: true
generateReleaseNotes: true

0 comments on commit a73de00

Please sign in to comment.