git pull log

delay log build default git
dromara · Sep 14, 2021 · 2ec403d · 2ec403d
1 parent 989fa69
commit 2ec403d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/modules/server/src/main/java/io/jpom/build/BuildManage.java b/modules/server/src/main/java/io/jpom/build/BuildManage.java
@@ -169,17 +169,18 @@ private boolean packageFile() throws InterruptedException {
 
  @Override
  public void run() {
- if (delay != null && delay > 0) {
- // 延迟执行
- ThreadUtil.sleep(delay, TimeUnit.SECONDS);
- }
  try {
  if (!updateStatus(BuildModel.Status.Ing)) {
  this.log("初始化构建记录失败,异常结束");
  return;
  }
  try {
  this.log("start build in file : " + FileUtil.getAbsolutePath(this.gitFile));
+ if (delay != null && delay > 0) {
+ // 延迟执行
+ this.log("Execution delayed by " + delay + " seconds");
+ ThreadUtil.sleep(delay, TimeUnit.SECONDS);
+ }
  //
  String branchName = buildModel.getBranchName();
  this.log("repository clone pull from " + branchName);

diff --git a/modules/server/src/main/java/io/jpom/util/GitUtil.java b/modules/server/src/main/java/io/jpom/util/GitUtil.java
@@ -191,7 +191,11 @@ public static void checkoutPull(String url, File file, String branchName, Creden
  setProgressMonitor(new TextProgressMonitor(printWriter)).
  call();
  }
- git.pull().setCredentialsProvider(credentialsProvider).call();
+ // 拉取新代码 pull
+ git.pull()
+ .setRemoteBranchName(branchName)
+ .setProgressMonitor(new TextProgressMonitor(printWriter))
+ .setCredentialsProvider(credentialsProvider).call();
  } catch (TransportException t) {
  checkTransportException(t);
  throw t;

diff --git a/web-vue/src/pages/build/list.vue b/web-vue/src/pages/build/list.vue
@@ -445,7 +445,9 @@ export default {
  },
  // 添加
  handleAdd() {
- this.temp = {};
+ this.temp = {
+ repoType: 0
+ };
  this.branchList = [];
  this.loadDispatchList();
  this.loadNodeProjectList();

diff --git a/web-vue/src/pages/node/list.vue b/web-vue/src/pages/node/list.vue
@@ -70,7 +70,7 @@
  </a-row>
  </a-form-model-item>
  <a-form-model-item label="绑定 SSH " prop="sshId">
- <a-select v-model="temp.sshId" placeholder="节点协议">
+ <a-select v-model="temp.sshId" placeholder="请选择SSH">
  <a-select-option v-for="ssh in sshList" :key="ssh.id" :disabled="ssh.disabled">{{ ssh.name }}</a-select-option>
  </a-select>
  </a-form-model-item>