Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a5c3188686 | |||
| 6a289b7b50 |
@@ -16,7 +16,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Install Rust stable
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
libxkbcommon-dev
|
||||
|
||||
- name: Cache cargo registry and build artifacts
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/registry
|
||||
@@ -59,7 +59,7 @@ jobs:
|
||||
needs: test
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Install Rust stable
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
libxkbcommon-dev
|
||||
|
||||
- name: Cache cargo registry and build artifacts
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/registry
|
||||
|
||||
@@ -32,7 +32,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Install Rust stable
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
|
||||
|
||||
- name: Cache cargo registry + build artifacts
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/registry
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
cp -r assets solitaire-quest/
|
||||
tar -czf solitaire-quest-linux-x86_64.tar.gz solitaire-quest
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: linux
|
||||
path: solitaire-quest-linux-x86_64.tar.gz
|
||||
@@ -76,7 +76,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Install Rust stable + Android targets
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
@@ -90,7 +90,7 @@ jobs:
|
||||
run: echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
|
||||
|
||||
- name: Cache cargo registry + cargo-apk binary + build artifacts
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/registry
|
||||
@@ -126,7 +126,13 @@ jobs:
|
||||
} >> solitaire_app/Cargo.toml
|
||||
|
||||
- name: Build and sign APK (release profile)
|
||||
run: cargo apk build -p solitaire_app --release
|
||||
# `--lib` scopes cargo-apk to the cdylib target only.
|
||||
# Without it, cargo-apk panics post-sign with
|
||||
# "Bin is not compatible with Cdylib" (cargo-subcommand
|
||||
# artifact iteration walks the bin target after the
|
||||
# cdylib APK is already produced). See SESSION_HANDOFF.md
|
||||
# "Cosmetic cargo apk build --lib workaround."
|
||||
run: cargo apk build -p solitaire_app --lib --release
|
||||
|
||||
- name: Stage APK for upload
|
||||
run: |
|
||||
@@ -134,7 +140,7 @@ jobs:
|
||||
"solitaire-quest-${{ github.ref_name }}.apk"
|
||||
rm release.keystore
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: android
|
||||
path: solitaire-quest-${{ github.ref_name }}.apk
|
||||
@@ -148,11 +154,11 @@ jobs:
|
||||
needs: [build-linux, build-android]
|
||||
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
- uses: actions/download-artifact@v5
|
||||
with:
|
||||
name: linux
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
- uses: actions/download-artifact@v5
|
||||
with:
|
||||
name: android
|
||||
|
||||
|
||||
Reference in New Issue
Block a user