Commit 178f5bc8 authored by nanahira's avatar nanahira

ref

parent 9304696b
...@@ -165,20 +165,6 @@ ...@@ -165,20 +165,6 @@
"port": 7213, "port": 7213,
"password": "Nanahira", "password": "Nanahira",
"hooks": { "hooks": {
"script": {
"path": "./ygopro/script/",
"remote": "origin",
"branch": "master",
"callback": {
"command": "git",
"args": [
"reset",
"--hard",
"FETCH_HEAD"
],
"path": "./ygopro/script/"
}
},
"windbot": { "windbot": {
"path": "./windbot/", "path": "./windbot/",
"remote": "origin", "remote": "origin",
...@@ -194,12 +180,12 @@ ...@@ -194,12 +180,12 @@
"ygopro": { "ygopro": {
"path": "./ygopro/", "path": "./ygopro/",
"remote": "origin", "remote": "origin",
"branch": "master", "branch": "server",
"callback": { "callback": {
"command": "bash", "command": "bash",
"args": [ "args": [
"-c", "-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro" "cd ocgcore ; git pull origin master ; cd ../script ; git pull origin master ; cd .. ; premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
], ],
"path": "./ygopro/" "path": "./ygopro/"
} }
......
...@@ -165,20 +165,6 @@ ...@@ -165,20 +165,6 @@
"port": 7213, "port": 7213,
"password": "Nanahira", "password": "Nanahira",
"hooks": { "hooks": {
"script": {
"path": "./ygopro/script/",
"remote": "origin",
"branch": "master",
"callback": {
"command": "git",
"args": [
"reset",
"--hard",
"FETCH_HEAD"
],
"path": "./ygopro/script/"
}
},
"windbot": { "windbot": {
"path": "./windbot/", "path": "./windbot/",
"remote": "origin", "remote": "origin",
...@@ -194,12 +180,12 @@ ...@@ -194,12 +180,12 @@
"ygopro": { "ygopro": {
"path": "./ygopro/", "path": "./ygopro/",
"remote": "origin", "remote": "origin",
"branch": "master", "branch": "server",
"callback": { "callback": {
"command": "bash", "command": "bash",
"args": [ "args": [
"-c", "-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro" "cd ocgcore ; git pull origin master ; cd ../script ; git pull origin master ; cd .. ; premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
], ],
"path": "./ygopro/" "path": "./ygopro/"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment