Skip to content

Commit

Permalink
Now don't use broken gh-describe
Browse files Browse the repository at this point in the history
Signed-off-by: Maxim Logaev <[email protected]>
  • Loading branch information
mxlgv committed Apr 1, 2024
1 parent 9afa4dd commit d6a6bdc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 28 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build-win64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ jobs:
install: git
- run: git config --global core.autocrlf input
- uses: actions/checkout@v4
- name: Git describe
id: ghd
uses: proudust/gh-describe@v2
- name: Build Dino
run: |
msys2 -c './build-win64.sh --prepare'
Expand All @@ -35,4 +32,4 @@ jobs:
file: windows-installer/dino-installer.exe
asset_name: dino-installer.exe
tag: ${{ github.ref }}
release_name: Dino ${{ steps.ghd.outputs.describe }}
release_name: Dino ${{ github.ref_name }}
42 changes: 18 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,21 @@ jobs:
image: bilelmoussaoui/flatpak-github-actions:gnome-44
options: --privileged
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- run: flatpak repair --user
- uses: flatpak/flatpak-github-actions/[email protected]
with:
manifest-path: im.dino.Dino.json
build-bundle: true
- name: Git describe
if: ${{ github.ref_type == 'tag' }}
id: ghd
uses: proudust/gh-describe@v2
with:
default: ''
- name: Release Dino installer
if: ${{ github.ref_type == 'tag' }}
uses: svenstaro/[email protected]
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: app.flatpak
asset_name: app.flatpak
tag: ${{ github.ref }}
release_name: Dino ${{ steps.ghd.outputs.describe }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- run: flatpak repair --user
- uses: flatpak/flatpak-github-actions/[email protected]
with:
manifest-path: im.dino.Dino.json
build-bundle: true
- name: Release Dino installer
if: ${{ github.ref_type == 'tag' }}
uses: svenstaro/[email protected]
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: app.flatpak
asset_name: app.flatpak
tag: ${{ github.ref }}
release_name: Dino ${{ github.ref_name }}

0 comments on commit d6a6bdc

Please sign in to comment.