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.

Sign up for GitHub

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

Jump to bottom

Fix github publish #733

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Fix github publish #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift click to select a range
63eb58f
Fix github publish
WardPearce Nov 30, 2024
86e3cd1
Build android after desktop completed
WardPearce Nov 30, 2024
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
17 changes: 8 additions & 9 deletions .github/workflows/prod-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 1,9 @@
name: Build Android
on:
push:
branches:
- 'main'
paths-ignore:
- '**/README.md'
workflow_run:
workflows: ["Build desktop"]
types:
- completed

permissions:
contents: write
Expand Down Expand Up @@ -67,8 66,8 @@ jobs:

- name: Move files to release
run: |
mv app/build/outputs/*.aab app/release/
mv app/build/outputs/*.apk app/release/
mv app/build/outputs/*signed.aab app/release/
mv app/build/outputs/*signed.apk app/release/

- name: Delete temp apks
run: rm app/release/*temp*
Expand All @@ -87,8 86,8 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./materialious/android/app/release/*
tag: v${{ steps.package-version.outputs.current-version }}
tag: ${{ steps.package-version.outputs.current-version }}
release_name: ${{ steps.package-version.outputs.current-version }}
overwrite: true
file_glob: true
draft: true
draft: false
20 changes: 16 additions & 4 deletions materialious/electron/electron-builder.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 34,11 @@
},
"win": {
"publish": [
"github"
{
"provider": "github",
"vPrefixedTagName": false,
"releaseType": "release"
}
],
"target": [
{
Expand Down Expand Up @@ -62,14 66,22 @@
},
"mac": {
"publish": [
"github"
{
"provider": "github",
"vPrefixedTagName": false,
"releaseType": "release"
}
],
"category": "Entertainment",
"target": "dmg"
},
"linux": {
"publish": [
"github"
{
"provider": "github",
"vPrefixedTagName": false,
"releaseType": "release"
}
],
"target": [
{
Expand Down Expand Up @@ -134,4 146,4 @@
"libsecret-1-0"
]
}
}
}