Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace QtKeychain with a submodule #161

Open
wants to merge 3 commits into
base: 1.8.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Build

on: push
on:
push:
workflow_dispatch:

jobs:
build-windows-msi:
Expand All @@ -15,6 +17,8 @@ jobs:
cache: true
- name: Checkout Repo
uses: actions/checkout@v4
with:
submodules: recursive
- name: Download Tools
run: python scripts\download.py
- name: Download OpenSSL
Expand Down Expand Up @@ -52,6 +56,8 @@ jobs:
cache: true
- name: Checkout Repo
uses: actions/checkout@v4
with:
submodules: recursive
- name: Download Tools
run: python scripts\download.py
- name: Download OpenSSL
Expand All @@ -76,8 +82,8 @@ jobs:
prerelease: true
tag: development
token: ${{ secrets.GITHUB_TOKEN }}
build-linux-appimage:
name: Linux Build (AppImage)
build-linux:
name: Linux Build (AppImage and source archive)
runs-on: ubuntu-20.04
steps:
- name: Install Dependencies
Expand All @@ -87,6 +93,12 @@ jobs:
sudo apt-get install qt515base qt515imageformats qt515svg qt515tools libgl1-mesa-dev libsecret-1-dev adb zipalign
- name: Checkout Repo
uses: actions/checkout@v4
with:
submodules: recursive
- name: Create Source Archives
run: |
scripts/git-archive-all.sh --format tar.gz apk-editor-studio_source_${{ env.VERSION }}.tar.gz
scripts/git-archive-all.sh --format zip apk-editor-studio_source_${{ env.VERSION }}.zip
- name: Download Tools
run: python3 scripts/download.py
- name: Build AppImage Package
Expand All @@ -98,7 +110,9 @@ jobs:
- name: Upload Assets
uses: ncipollo/release-action@v1
with:
artifacts: scripts/linux/packages/appimage/apk-editor-studio_linux_${{ env.VERSION }}.AppImage
artifacts: "scripts/linux/packages/appimage/apk-editor-studio_linux_${{ env.VERSION }}.AppImage,\
apk-editor-studio_source_${{ env.VERSION }}.tar.gz,\
apk-editor-studio_source_${{ env.VERSION }}.zip"
artifactErrorsFailBuild: true
allowUpdates: true
omitName: true
Expand All @@ -117,6 +131,8 @@ jobs:
cache: true
- name: Checkout Repo
uses: actions/checkout@v4
with:
submodules: recursive
- name: Download Tools
run: python3 scripts/download.py
- name: Build APP/DMG Package
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/QtKeychain"]
path = lib/QtKeychain
url = https://github.com/frankosterfeld/qtkeychain
10 changes: 10 additions & 0 deletions COMPILATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ During the run-time, APK Editor Studio uses these third-party tools which are no

Running the `scripts/download.py` script will automatically download the needed tools.

## Clone and get submodules

If initially cloning:

- Run `git clone --recurse-submodules https://github.com/kefir500/apk-editor-studio`

If in an existing repo:

- Run `git submodule update --init --recursive`

## Building

- Run `cmake -B your/build/path -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="path/to/qt"`
Expand Down
1 change: 1 addition & 0 deletions lib/QtKeychain
Submodule QtKeychain added at f6705f
50 changes: 0 additions & 50 deletions lib/QtKeychain/.gitignore

This file was deleted.

Loading