PR

【10/18】リリース #1220

kouho opened this at 2021-10-18T09:35:06; closed

Description

opened by kouho at 2021-10-18T09:35:06; updated 2025-10-17T13:07:20

概要

建築イベントのリリースを行うPRです。
https://docs.google.com/spreadsheets/d/1_pztkH9RE87nFZY6iDdFOF8nQmwkHNn6nI-k-M5veig/edit#gid=133142113

ブランチ

web:release_101811
db:release_101811

テスト方法、確認した内容

  • event_build_1156ブランチの更新を全部取り込んでいるか
  • コンフリクトがefine_y.incで起きたためそれぞれ更新内容に誤りがないかどうか

TODO

レビュー後リリース予定

建築イベントリリース

建築物 object_no = 10017

DB更新

  • [x] DB更新
git checkout master
git merge release_101811
git push 

#本番
ssh jr-adm
deploy db

リリース作業

  • [x] DBの初期化
#対象テーブル
1.`user_build_stack`
2.`user_object`
3.`user_build_event_bonus`
4.`user_build_event_bonus_daily`
5.`log_build_event_bonus_time`
6.`log_build_event_bonus_time_main`
7.`log_build_event_bonus_time_use`

1 & 2
 初期化(前回のイベント建物だけ消す)
 DELETE FROM `user_build_stack` WHERE `build_x` = 99 AND `build_y` = 99;
 DELETE FROM `user_object` WHERE `build_x` =99 AND `build_y` =99;
 確認
 SELECT * FROM `user_build_stack` WHERE `build_x` = 99 AND `build_y` = 99;
 SELECT * FROM `user_object` WHERE `build_x` =99 AND `build_y` =99;

3 ~ 7
  TRUNCATE TABLE `user_build_event_bonus`;
  TRUNCATE TABLE `user_build_event_bonus_daily`;
  TRUNCATE TABLE `log_build_event_bonus_time`;
  TRUNCATE TABLE `log_build_event_bonus_time_main`;
  TRUNCATE TABLE `log_build_event_bonus_time_use`;
  TRUNCATE TABLE `log_user_build_bonus_ranking`;
  • [x] 本番環境更新
#本番更新
Mertge pull request
ssh jr-adm
update web
deploy web
  • [x] merge master
  • develop
  • cpanel
  • [x] 管理画面
  • 告知 1004 1005 公開
  • swf告知 284 公開
  • 告知バナー 72 公開
  • 建築データ 6058 6059 6060 20005 10017 確認
kouho add_label at 2021-10-18T09:35:10: マスタへマージ

Comment

#14437 by kouho at 2021-10-18T09:40:03; updated 2021-10-18T09:40:03

@wada @iwamoto
念のため確認をお願いいたします。

Comment

#14438 by wada at 2021-10-18T09:56:05; updated 2021-10-18T09:56:05

@kouho
確認OKです

wada add_label at 2021-10-18T09:56:09: 和田 LGTM

Comment

#14440 by iwamoto at 2021-10-18T10:22:23; updated 2021-10-18T10:22:23

@kouho
確認しました。

iwamoto add_label at 2021-10-18T10:22:27: 岩本 LGTM
kouho merge at 2021-10-18T13:57:14: 【10/18】リリース
kouho close at 2021-10-18T13:57:14: Close

Commit range

baseddf3c0f13b88756bdcabee13e9f25c5d8b1ac3bb
head1bcc7b805a609b97f2464a5d0a97277c952f2b45
base branchjolly/jr-web:master
head branchjolly/jr-web:release_101811

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed10 filesView patch
statusfile
addedisland_img/object_20005.png
modifiedlib/ajax/main_default.inc
modifiedlib/conf/class/BuildEventItemConfig.class.php
modifiedlib/conf/define_y.inc
addedlib/conf/exception_users.inc
modifiedlib/exec/tool_jrce_status.php
addedpublic_html/img/island/60/object_20005.jpg
addedpublic_html/img/island/object/object_20005.png
addedpublic_html/img/temp_build/event/exmode1018.jpg
modifiedpublic_html/template/BuildingStorage-ReserveDeleteResult.tpl
Patch body is stored as a separate file to keep this page lightweight.