Now don't use broken gh-describe

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>
This commit is contained in:
Maxim Logaev 2024-04-01 16:44:43 +03:00
parent 9afa4ddb72
commit d6a6bdc546
2 changed files with 19 additions and 28 deletions

View file

@ -12,9 +12,6 @@ jobs:
install: git install: git
- run: git config --global core.autocrlf input - run: git config --global core.autocrlf input
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Git describe
id: ghd
uses: proudust/gh-describe@v2
- name: Build Dino - name: Build Dino
run: | run: |
msys2 -c './build-win64.sh --prepare' msys2 -c './build-win64.sh --prepare'
@ -35,4 +32,4 @@ jobs:
file: windows-installer/dino-installer.exe file: windows-installer/dino-installer.exe
asset_name: dino-installer.exe asset_name: dino-installer.exe
tag: ${{ github.ref }} tag: ${{ github.ref }}
release_name: Dino ${{ steps.ghd.outputs.describe }} release_name: Dino ${{ github.ref_name }}

View file

@ -31,27 +31,21 @@ jobs:
image: bilelmoussaoui/flatpak-github-actions:gnome-44 image: bilelmoussaoui/flatpak-github-actions:gnome-44
options: --privileged options: --privileged
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- run: flatpak repair --user - run: flatpak repair --user
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1 - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
with: with:
manifest-path: im.dino.Dino.json manifest-path: im.dino.Dino.json
build-bundle: true build-bundle: true
- name: Git describe - name: Release Dino installer
if: ${{ github.ref_type == 'tag' }} if: ${{ github.ref_type == 'tag' }}
id: ghd uses: svenstaro/upload-release-action@2.9.0
uses: proudust/gh-describe@v2 with:
with: repo_token: ${{ secrets.GITHUB_TOKEN }}
default: '' file: app.flatpak
- name: Release Dino installer asset_name: app.flatpak
if: ${{ github.ref_type == 'tag' }} tag: ${{ github.ref }}
uses: svenstaro/upload-release-action@2.9.0 release_name: Dino ${{ github.ref_name }}
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: app.flatpak
asset_name: app.flatpak
tag: ${{ github.ref }}
release_name: Dino ${{ steps.ghd.outputs.describe }}