Skip to content

Commit 7381d80

Browse files
committed
修改构建
1 parent c7af139 commit 7381d80

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
check-latest: true
4141

4242
- name: Build
43-
run: go build -o dist/${{ env.BUILD_NAME }} main.go && ls dist
43+
run: bash ./build.sh
4444

4545
- name: Get version
4646
id: get_version

build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
set -e
3+
git_hash=$(git rev-parse --short HEAD 2>/dev/null)
4+
version="1.1.0-${git_hash}"
5+
go build -ldflags "-X main.version=${version}" -o dist/${build_name} main.go
6+
ls dist

main.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ type VersionInfo struct {
4747
Libraries []Library `json:"libraries"`
4848
}
4949

50+
var gitversion string
51+
5052
func downloadServerJar(version, loader, librariesDir string) error {
5153
downloadURL := fmt.Sprintf("https://bmclapi2.bangbang93.com/version/%s/server", version)
5254
var serverFileName string
@@ -321,6 +323,12 @@ func findJava() (string, bool) {
321323
}
322324

323325
func main() {
326+
if gitversion == "" {
327+
gitversion = "NaN"
328+
}
329+
if len(os.Args) > 1 && os.Args[1] == "--version" {
330+
fmt.Println("AutoInstall-" + gitversion)
331+
}
324332
instFile := "inst.json"
325333
var config InstConfig
326334
if _, err := os.Stat(instFile); err == nil {
@@ -334,10 +342,9 @@ func main() {
334342
log.Println("无法解析 inst.json 文件:", err)
335343
return
336344
}
337-
345+
fmt.Println("AutoInstall-" + gitversion + " https://github.com/autoinst/AutoInstall")
338346
fmt.Println("准备安装:")
339347
fmt.Printf("Minecraft版本: %s\n", config.Version)
340-
fmt.Printf("Minecraft版本: %s\n", config.Version)
341348
if config.Loader != "vanilla" {
342349
fmt.Printf("加载器: %s\n", config.Loader)
343350
fmt.Printf("加载器版本: %s\n", config.LoaderVersion)

0 commit comments

Comments
 (0)