floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX test gitea create webhook

This commit is contained in:
Jasder 2020-09-04 17:51:39 +08:00
parent e77475e26a
commit 9613f4c485
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/ci/cloud_accounts_controller.rb
View File

@ -31,9 +31,12 @@ class Ci::CloudAccountsController < Ci::BaseController
ci_user = Ci::User.find_by(user_login: current_user.login) ci_user = Ci::User.find_by(user_login: current_user.login)
repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first
begin begin
Rails.logger.info "============activate ======== #{ci_user.user_login} -- #{repo.repo_name}"
repo.activate!(ci_user.user_id) repo.activate!(ci_user.user_id)
Rails.logger.info "==========activate start create hook ========"
result = bind_hook!(current_user, @cloud_account, repo) result = bind_hook!(current_user, @cloud_account, repo)
@project.update_columns(:open_devops, true, gitea_webhook_id: result['id']) Rails.logger.info "=========activate create hook result #{result}"
@project.update_columns(open_devops: true, gitea_webhook_id: result['id']) if result
@cloud_account.update_column(:ci_user_id, ci_user.user_id) @cloud_account.update_column(:ci_user_id, ci_user.user_id)
render_ok render_ok
@ -158,9 +161,10 @@ class Ci::CloudAccountsController < Ci::BaseController
}, },
"type": "gitea" "type": "gitea"
} }
Rails.logger.info "----------bind hook --------"
result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params) result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params)
regurn nil if result.status unless result.status == 201 regurn nil unless result.status == 201
Rails.logger.info "----------bind hook success--------"
body = JSON.parse(result.body) body = JSON.parse(result.body)
@project.update_column(:gitea_webhook_id, body['id']) @project.update_column(:gitea_webhook_id, body['id'])
body body