clean up build file and use builder 6.3

This commit is contained in:
2024-07-10 23:15:41 +02:00
parent fbc4d5ca9a
commit 9063d4ff75
2 changed files with 7 additions and 7 deletions

View File

@@ -22,7 +22,7 @@ jobs:
run: cargo fmt --all -- --check run: cargo fmt --all -- --check
flatpak: flatpak:
name: Flatpak name: Flatpak-prerelease
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: bilelmoussaoui/flatpak-github-actions:gnome-46 image: bilelmoussaoui/flatpak-github-actions:gnome-46
@@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
lfs: true lfs: true
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
with: with:
bundle: toolboxtuner.flatpak bundle: toolboxtuner.flatpak
manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json
@@ -44,7 +44,7 @@ jobs:
path: | path: |
*.flatpak *.flatpak
vendor: vendor:
name: vendor name: vendor-prerelease
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -60,6 +60,7 @@ jobs:
*.tar.gz *.tar.gz
*.sha256sum *.sha256sum
publish-prerelease: publish-prerelease:
name: publish-prerelease
needs: [flatpak, vendor] needs: [flatpak, vendor]
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: startsWith(github.ref_name, 'main') && github.ref_type == 'branch' if: startsWith(github.ref_name, 'main') && github.ref_type == 'branch'

View File

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