Merge branch 'main' into adb/integrated-videocalls

This commit is contained in:
adb 2025-09-24 16:29:51 +02:00 committed by GitHub
commit ec576d7159
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions

View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
artifacts-url-comments: artifacts-url-comments:
name: add artifact links to pull request name: add artifact links to pull request
runs-on: windows-2019 runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }} if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps: steps:
- name: add artifact links to pull request - name: add artifact links to pull request

View file

@ -2,27 +2,27 @@ name: Upload Preview APK
on: pull_request on: pull_request
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
jobs: jobs:
build: build:
name: Upload Preview APK name: Upload Preview APK
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Cancel Previous Runs - uses: actions/checkout@v5
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:
working-directory: jni/deltachat-core-rust working-directory: jni/deltachat-core-rust
- uses: actions/setup-java@v3 - uses: actions/setup-java@v5
with: with:
java-version: 17 java-version: 17
distribution: 'temurin' distribution: 'temurin'
- uses: android-actions/setup-android@v3 - uses: android-actions/setup-android@v3
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches