diff --git a/js/desktop/package.json b/js/desktop/package.json index 77ce02e6a..8be8c00e9 100644 --- a/js/desktop/package.json +++ b/js/desktop/package.json @@ -11,7 +11,7 @@ "make": "electron-forge make", "publish": "electron-forge publish", "nolint": "eslint --ext .ts,.tsx .", - "prepare": "if [ -z \"$CF_PAGES\" ]; then CGO_ENABLED=0 go run ../../pkg/config/git/git.go --js > src/version.ts; else echo 'export const version = \"unknown\"; export const buildTime = 0; export const uuid = \"00000000-0000-0000-0000-000000000000\";' > src/version.ts; fi" + "prepare": "CGO_ENABLED=0 go run ../../pkg/config/git/git.go --js > src/version.ts" }, "devDependencies": { "@electron-forge/cli": "^7.5.0", diff --git a/pkg/config/git/git.go b/pkg/config/git/git.go index 0d48e798a..87ff00e17 100644 --- a/pkg/config/git/git.go +++ b/pkg/config/git/git.go @@ -82,15 +82,10 @@ func makeGit() error { homebrew := flag.Bool("homebrew", false, "print homebrew formula") flag.Parse() - r, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true}) - if err != nil { - // fallback for CI environments without full git history - var out string - if *javascript { - out = fmt.Sprintf(tmplJS, "unknown", 0, "00000000-0000-0000-0000-000000000000") - } else { - out = fmt.Sprintf(tmpl, "unknown", 0, "00000000-0000-0000-0000-000000000000") - } + + // handle CF_PAGES environment fallback + if os.Getenv("CF_PAGES") != "" && *javascript { + out := `export const version = "unknown"; export const buildTime = 0; export const uuid = "00000000-0000-0000-0000-000000000000";` if *output != "" { if err := os.WriteFile(*output, []byte(out), 0644); err != nil { return err @@ -100,6 +95,10 @@ func makeGit() error { } return nil } + r, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true}) + if err != nil { + return err + } // ... retrieving the HEAD reference ref, err := r.Head()