Skip to content

Commit

Permalink
try building this
Browse files Browse the repository at this point in the history
  • Loading branch information
prolic committed Nov 14, 2024
1 parent e346317 commit f2be3e5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 28 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:
contents: write

jobs:
build-and-publish:
build:
name: Build and Publish Flatpak (Continuous)
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -69,7 +69,6 @@ jobs:
cp $(cabal list-bin futr) flatpak/futr
- name: Import GPG Key
if: ${{ secrets.GPG_PRIVATE_KEY != '' }}
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
Expand Down Expand Up @@ -97,3 +96,13 @@ jobs:
name: futr-flatpak-continuous
path: com.futrnostr.futr-x86_64
retention-days: 7

deploy:
name: Deploy to GitHub Pages
needs: build
runs-on: ubuntu-latest
if: ${{ success() }}
steps:
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1

21 changes: 0 additions & 21 deletions .github/workflows/flatpak-repo.yml

This file was deleted.

20 changes: 15 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- 'v*'

permissions:
contents: write
contents: read
pages: write # Required for GitHub Pages deployment
id-token: write # Required for GitHub Pages deployment

jobs:
flatpak-build-and-release:
name: Flatpak Build and Release (Stable)
build:
name: Build and Release Flatpak
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand Down Expand Up @@ -70,7 +72,6 @@ jobs:
cp $(cabal list-bin futr) flatpak/futr
- name: Import GPG Key
if: ${{ secrets.GPG_PRIVATE_KEY != '' }}
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
Expand Down Expand Up @@ -112,4 +113,13 @@ jobs:
tag_name: ${{ github.ref }}
prerelease: false
generate_release_notes: true
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.TOKEN }}

deploy:
name: Deploy to GitHub Pages
needs: build
runs-on: ubuntu-latest
if: ${{ success() }}
steps:
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1

0 comments on commit f2be3e5

Please sign in to comment.