Merge pull request #1 from hash-rabbit/feat-goversion

Feat goversion
vamosdalian · Dec 27, 2023 · 0c83ed2 · 0c83ed2
2 parents 60ca143 + 3746c8c
commit 0c83ed2
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 11 deletions.
diff --git a/.github/workflows/tmp.yml b/.github/workflows/tmp.yml
@@ -0,0 +1,34 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Tmp
+
+on:
+  push:
+    branches: [ "feat-goversion" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.20'
+
+    - name: Build
+      run: go build -v
+
+    - name: Test
+      run: go test -v ./...
+
+    - name: Upload
+      id: upload
+      uses: actions/upload-artifact@v3
+      with:
+        name: auto-build
+        path: ./auto-build
diff --git a/logic/task.go b/logic/task.go
@@ -145,7 +145,7 @@ func StartTask(wr http.ResponseWriter, r *http.Request) {
 
 	t := &task{
 		id:        tl.Id,
-		goversion: tk.GoVersion,
+		goversion: p.GoVersion,
 		p:         p,
 		t:         tk,
 		tl:        tl,
@@ -287,7 +287,7 @@ func readline(str string) []string {
 }
 
 func (t *task) getEnv() []string {
-	env := make([]string, 0)
+	env := os.Environ()
 	if t.p.GoMod {
 		env = append(env, "GO111MODULE=on")
 	} else {

diff --git a/logic/webhook.go b/logic/webhook.go
@@ -109,7 +109,7 @@ func autobuild(taskid int64) {
 
 	t := &task{
 		id:        tl.Id,
-		goversion: tk.GoVersion,
+		goversion: p.GoVersion,
 		p:         p,
 		t:         tk,
 		tl:        tl,

diff --git a/model/Task.go b/model/Task.go
@@ -14,9 +14,9 @@ const (
 )
 
 type Task struct {
-	Id             int64     `xorm:"pk" json:"id"`
-	ProjectId      int64     `xorm:"index" json:"project_id"`
-	GoVersion      string    `xorm:"index" json:"go_version_id"` // envid
+	Id        int64 `xorm:"pk" json:"id"`
+	ProjectId int64 `xorm:"index" json:"project_id"`
+	// GoVersion      string    `xorm:"index" json:"go_version_id"` // envid
 	Branch         string    `xorm:"varchar(10)" json:"branch"`
 	AutoBuild      bool      `xorm:"Bool" json:"auto_build"`
 	MainFile       string    `xorm:"varchar(20)" json:"main_file"` // 主文件

diff --git a/model/model.go b/model/model.go
@@ -22,10 +22,10 @@ func InitModel() {
 		log.Panicf("init sql lite error:%s", err)
 	}
 
-	// err = AuthMergeTable()
-	// if err != nil {
-	// 	log.Panicf("auto merge table error:%s", err)
-	// }
+	err = AuthMergeTable()
+	if err != nil {
+		log.Panicf("auto merge table error:%s", err)
+	}
 }
 
 func InitNode() error {

diff --git a/model/project.go b/model/project.go
@@ -12,8 +12,9 @@ type Project struct {
 	Url            string    `xorm:"varchar(50)"  json:"url"`
 	MainBranch     string    `xorm:"varchar(30) default master" json:"main_branch"`
 	Token          string    `xorm:"varchar(50)"  json:"token"`
+	GoVersion      string    `xorm:"index" json:"go_version_id"` // envid
 	GoMod          bool      `xorm:"bool" json:"go_mod"`
-	WorkSpace      string    `xorm:"varchar(50)" json:"workspace"` //only go path(not mod) used
+	WorkSpace      string    `xorm:"varchar(50)" json:"workspace"` // only go path(not mod) used
 	Env            string    `xorm:"varchar(255)" json:"env"`      // 环境变量key1=value1;key2=value2
 	BeforeBuildCmd string    `xorm:"varchar(255)" json:"before_build_cmd"`
 	AfterBuildCmd  string    `xorm:"varchar(255)" json:"after_build_cmd"`