s1d3sw1ped/SwipedModSwitcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request 'small typo fix and removed unneeded global variable' (#23) from cleanup_typos into develop
Some checks failed
CI / Lint (push) Failing after 36s
Details
CI / Test (push) Successful in 1m37s
Details
CI / Test (pull_request) Successful in 1m17s
Details
CI / Lint (pull_request) Successful in 1m55s
Details
CI / Build (push) Successful in 2m56s
Details
CI / Build (pull_request) Successful in 2m20s
Details

Browse Source 
Reviewed-on: #23
This commit is contained in:
s1d3sw1ped
2024-05-20 06:51:53 +00:00
parent 35d888ec62 4cbb0666cb
commit b2bef77f09
5 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitea/workflows/pull-request-ci.yaml
View File

@@ -19,6 +19,11 @@ jobs:
check-latest: true
cache: true
- name: Setup OS dependencies
run: |
apt-get update
apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
- name: Install go dependencies
run: go mod tidy
@@ -90,7 +95,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}
@@ -102,7 +107,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}
@@ -115,5 +120,5 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: swiped-mod-switcher-${{github.ref_name}}
name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
path: bin/

6
.gitea/workflows/push-ci.yaml
View File

@@ -91,7 +91,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
ls bin
env:
VERSION: ${{github.ref_name}}
@@ -103,7 +103,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
ls bin
env:
VERSION: ${{github.ref_name}}
@@ -116,5 +116,5 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: swiped-mod-switcher-${{github.ref_name}}
name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
path: bin/

4
.gitea/workflows/tag-release.yaml
View File

@@ -87,7 +87,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}
@@ -99,7 +99,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}

2
FyneApp.toml
View File

@@ -2,5 +2,3 @@
Icon = "icon.png"
Name = "Swiped Mod Switcher"
ID = "com.s1d3sw1ped.swipedmodswitcher"
Version = "0.0.0"
Build = 2

32
main.go
View File

@@ -4,9 +4,9 @@ import (
"fmt"
"os"
"path/filepath"
"runtime/debug"
"s1d3sw1ped/swipedmodswitcher/admin"
"slices"
"strconv"
"strings"
"fyne.io/fyne/v2"
@@ -18,8 +18,6 @@ import (
"gopkg.in/yaml.v3"
)
var Version = ""
type Config struct {
ModProfilesDirectory string `yaml:"mod_profiles_dir"`
GameModsDirectory string `yaml:"game_mods_dir"`
@@ -74,7 +72,31 @@ func main() {
cfg = loadConfig()
ap := app.New()
wp := ap.NewWindow(ap.Metadata().Name + " v" + ap.Metadata().Version + "." + strconv.Itoa(ap.Metadata().Build))
commithash := func() string {
if info, ok := debug.ReadBuildInfo(); ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
return setting.Value
}
}
}
return ""
}()
buildversion := ap.Metadata().Custom["BuildVersion"]
if buildversion == "" {
buildversion = ""
}
buildnumber := ap.Metadata().Custom["BuildNumber"]
if buildnumber == "" {
buildnumber = "commit " + commithash
} else {
buildnumber = "build " + buildnumber
}
wp := ap.NewWindow(ap.Metadata().Name + " " + buildversion + " " + buildnumber)
wp.Resize(fyne.NewSize(600, 1))
wp.CenterOnScreen()
@@ -189,6 +211,6 @@ func makeIFunc(profile, archive string, parent fyne.Window) func() {
return
}
dialog.NewInformation("Success", fmt.Sprintf("filinked files from %s to %s", filepath.Base(profile), archive), parent).Show()
dialog.NewInformation("Success", fmt.Sprintf("linked files from %s to %s", filepath.Base(profile), archive), parent).Show()
}
}