Skip to content

Commit fe5d49a

Browse files
committed
Remove version script.
Include proper version info in `FyneApp.toml`
1 parent b5e3039 commit fe5d49a

File tree

4 files changed

+8
-25
lines changed

4 files changed

+8
-25
lines changed

.github/workflows/release.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ jobs:
4141
- name: Install Fyne
4242
run: go install fyne.io/fyne/v2/cmd/fyne@latest
4343
- name: Generate version file
44-
run: go run script/generateVersion.go
44+
run: |
45+
VERSION=$(git describe --tags --abbrev=0 | tail -c +2)
46+
echo "$VERSION" >> assets/version
47+
echo " Version = \"$VERSION\"" >> FyneApp.toml
4548
- name: Build GUI version
4649
run: |
4750
fyne package -os linux
@@ -75,7 +78,10 @@ jobs:
7578
- name: Install Fyne
7679
run: go install fyne.io/fyne/v2/cmd/fyne@latest
7780
- name: Generate version file
78-
run: go run script\generateVersion.go
81+
run: |
82+
$version = (git describe --tags --abbrev=0).Substring(1)
83+
$version | Out-File -FilePath "assets/version" -Append
84+
" Version = `"$version`"" | Out-File -FilePath "FyneApp.toml" -Append
7985
- name: Build
8086
run: |
8187
fyne package -os windows

FyneApp.toml

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ Website = "https://github.com/ubavic/bas-celik"
44
Icon = "assets/logo.png"
55
Name = "Bas Celik"
66
ID = "com.github.ubavic.bas-celik"
7-
Version = "1.0.0"
87
Build = 1

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ Aplikacija je podeljena na sledeće pakete:
120120

121121
Ostali direktorijumi u okviru projekta:
122122
+ `embed` i `assets` - dodatne datoteke. Neke se linkuju u izvršnu verziju prilikom kompilacije.
123-
+ `script` - dodatne skripte.
124123
+ `docs` - eksterna dokumentacija
125124

126125
## Doprinos

script/generateVersion.go

-21
This file was deleted.

0 commit comments

Comments
 (0)