Skip to content

Commit

Permalink
clean up build file and use builder 6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
13hannes11 committed Jul 10, 2024
1 parent fbc4d5c commit 9063d4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: cargo fmt --all -- --check

flatpak:
name: Flatpak
name: Flatpak-prerelease
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-46
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
with:
bundle: toolboxtuner.flatpak
manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json
Expand All @@ -44,7 +44,7 @@ jobs:
path: |
*.flatpak
vendor:
name: vendor
name: vendor-prerelease
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -60,6 +60,7 @@ jobs:
*.tar.gz
*.sha256sum
publish-prerelease:
name: publish-prerelease
needs: [flatpak, vendor]
runs-on: ubuntu-latest
if: startsWith(github.ref_name, 'main') && github.ref_type == 'branch'
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
name: "tagged-release"

on:
push:
tags:
- "v[0-9]+.0-9]+.0-9]+"

jobs:
flatpak:
name: Flatpak
Expand All @@ -17,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
with:
bundle: toolboxtuner.flatpak
manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.json
Expand Down Expand Up @@ -45,7 +43,8 @@ jobs:
path: |
*.tar.gz
*.sha256sum
publish-prerelease:
publish-release:
name: publish-release
needs: [flatpak, vendor]
runs-on: ubuntu-latest
steps:
Expand Down

0 comments on commit 9063d4f

Please sign in to comment.