parent
a9312c837e
commit
907f9aa6f2
2 changed files with 49 additions and 48 deletions
|
@ -14,6 +14,7 @@ on:
|
|||
- 'CMakeModules/**'
|
||||
- 'dist/**'
|
||||
- 'externals/**'
|
||||
- 'CMakeLists.txt'
|
||||
- 'vcpkg.json'
|
||||
paths-ignore:
|
||||
- 'src/android/**'
|
||||
|
@ -24,6 +25,7 @@ on:
|
|||
- 'CMakeModules/**'
|
||||
- 'dist/**'
|
||||
- 'externals/**'
|
||||
- 'CMakeLists.txt'
|
||||
- 'vcpkg.json'
|
||||
paths-ignore:
|
||||
- 'src/android/**'
|
||||
|
@ -171,47 +173,47 @@ jobs:
|
|||
# with:
|
||||
# name: ${{ env.INDIVIDUAL_EXE }}
|
||||
# path: ${{ env.INDIVIDUAL_EXE }}
|
||||
android:
|
||||
runs-on: ubuntu-latest
|
||||
needs: format
|
||||
steps:
|
||||
- uses: https://code.forgejo.org/actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
- name: set up JDK 17
|
||||
uses: https://github.com/actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
- name: Set up cache
|
||||
uses: https://code.forgejo.org/actions/cache@v3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
.ccache
|
||||
key: ${{ runner.os }}-android-${{ github.sha }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-android-
|
||||
- name: Query tag name
|
||||
uses: https://github.com/olegtarasov/get-tag@v2.1.2
|
||||
id: tagName
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
|
||||
- name: Build
|
||||
run: ./.ci/scripts/android/build.sh
|
||||
- name: Copy and sign artifacts
|
||||
env:
|
||||
ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
|
||||
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||
ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
|
||||
run: ./.ci/scripts/android/upload.sh
|
||||
- name: Upload
|
||||
uses: https://code.forgejo.org/actions/upload-artifact@v3
|
||||
with:
|
||||
name: android
|
||||
path: artifacts/
|
||||
# android:
|
||||
# runs-on: ubuntu-latest
|
||||
# needs: format
|
||||
# steps:
|
||||
# - uses: https://code.forgejo.org/actions/checkout@v3
|
||||
# with:
|
||||
# submodules: recursive
|
||||
# fetch-depth: 0
|
||||
# - name: set up JDK 17
|
||||
# uses: https://github.com/actions/setup-java@v3
|
||||
# with:
|
||||
# java-version: '17'
|
||||
# distribution: 'temurin'
|
||||
# - name: Set up cache
|
||||
# uses: https://code.forgejo.org/actions/cache@v3
|
||||
# with:
|
||||
# path: |
|
||||
# ~/.gradle/caches
|
||||
# ~/.gradle/wrapper
|
||||
# .ccache
|
||||
# key: ${{ runner.os }}-android-${{ github.sha }}
|
||||
# restore-keys: |
|
||||
# ${{ runner.os }}-android-
|
||||
# - name: Query tag name
|
||||
# uses: https://github.com/olegtarasov/get-tag@v2.1.2
|
||||
# id: tagName
|
||||
# - name: Install dependencies
|
||||
# run: |
|
||||
# sudo apt-get update
|
||||
# sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
|
||||
# - name: Build
|
||||
# run: ./.ci/scripts/android/build.sh
|
||||
# - name: Copy and sign artifacts
|
||||
# env:
|
||||
# ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
|
||||
# ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||
# ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
|
||||
# run: ./.ci/scripts/android/upload.sh
|
||||
# - name: Upload
|
||||
# uses: https://code.forgejo.org/actions/upload-artifact@v3
|
||||
# with:
|
||||
# name: android
|
||||
# path: artifacts/
|
||||
|
||||
|
|
|
@ -1756,11 +1756,10 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
|
|||
}
|
||||
|
||||
if (!ContentManager::AreKeysPresent()) {
|
||||
QMessageBox::warning(this, tr("Derivation Components Missing"),
|
||||
tr("Encryption keys are missing. "
|
||||
"In order to use this emulator, "
|
||||
"you need to provide your own encryption keys "
|
||||
"in order to play them."));
|
||||
QMessageBox::warning(
|
||||
this, tr("Encryption Keys Missing"),
|
||||
tr("In order to use suyu you need to provide your own encryption keys. "
|
||||
"You can install them by going to Tools -> Install encryption keys."));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue