SVNとGitを同期した話~Subgit~

by Skycat

Slide 1

Slide 1 text

SVNͱGITΛಉظͨ͠࿩ ʙ Subgit ʙ 2017/09/19

Slide 2

Slide 2 text

ࣗݾ঺հ দຊ ୓໵ ▸ גࣜձࣾϋγΰ ▸ αʔόʔαΠυΤϯδχΞ ▸ Twitter: skycat_me ▸ Facebook: takuya.matsumoto.cat

Slide 3

Slide 3 text

๭ϓϩδΣΫτ ▸ SVN؅ཧ ▸ ίʔυϨϏϡʔͭΒ͍ ▸ hook͕࢖͑ͳ͍ʢେਓͷࣄ৘

Slide 4

Slide 4 text

ͳʹΑΓ Git Ͱ΍Γ͍ͨ GitlabͰιʔεϨϏϡʔ΍Γ͍ͨ… GitlabCIͰࣗಈςετ΍Γ͍ͨ… GitlabͷWebhookͰChatOpsతͳͷ΍Γ͍ͨ…

Slide 5

Slide 5 text

Ͱ΋େਓͷࣄ৘Ͱ ׬શҠߦ͸Ͱ͖ͳ͍

Slide 6

Slide 6 text

Subgitͬͯ΍͕ͭΑͦ͞͏ʂ

Slide 7

Slide 7 text

׬શಉظʂ Subversion <=> Git

Slide 8

Slide 8 text

ίετ͸… খن໛ͳνʔϜͳΒແྉʢSubgitࣗମͷ

Slide 9

Slide 9 text

ָͪΜಋೖ ▸ Java੡ͳͷͰJava͕ඞਢͰ͢ʂʂ ▸ vagrantbox ubuntu/trusty64؀ڥ # java8 install $ sudo add-apt-repository ppa:webupd8team/java $ sudo apt-get update $ sudo apt-get install oracle-java8-installer # Subgit install $ wget https://subgit.com/download/subgit_3.2.4_all.deb $ sudo dpkg -i subgit_3.2.4_all.deb $ sudo apt-get install -f

Slide 10

Slide 10 text

ָͪΜಋೖ ▸ GitRepositoryΛੜ੒ͯ͠SubgitίϚϯυΛଧ͚ͭͩʂ $ subgit configure {svn_repository_url} {git_repository} # sugitσΟϨΫτϦ͕ੜ੒͞ΕΔʂ # SVNͱGitͷϢʔβϚοϐϯάઃఆ $ vim {git_repository}/subgit/authors.txt matsumoto_takuya = skycat # SVNಉظઃఆʢྫͩͱSVNͷtrunk͕GitͷmasterʹͳΓ·͢) $ vim {git_repository}/subgit/config trunk = :refs/heads/master branches = branches/*:refs/heads/feature/* # SVNΞΫηε৘ใ sshKeyFile = svn private Key userName =UserName

Slide 11

Slide 11 text

ࡉ͔͍ઃఆ # SVNಉظઃఆʢྫͩͱSVNͷtrunk͕GitͷmasterʹͳΓ·͢) $ vim {git_repository}/subgit/config minimalRevision=630000 SVNͷϦϙδτϦ͕ංେԽͯ͠͠·͍ͬͯΔ৔߹͸ɺ ಛఆͷϦϏδϣϯ͔Βಉظ͢Δ͜ͱ͕Մೳʂ Revision630000Ҏ͔߱Βಉظʂ

Slide 12

Slide 12 text

Քಇʂ # SVNΠϯετʔϧ $ subgit install {git_repository}/subgit/config SVNͷϦϙδτϦ͕ංେԽͯ͠͠·͍ͬͯΔ৔߹͸ɺ ಛఆͷϦϏδϣϯ͔Βಉظ͢Δ͜ͱ͕Մೳʂ ੒ޭͨ͠ΒDaemonىಈͯ͠ಉظ͠·͢ʂ

Slide 13

Slide 13 text

෭࢈෺͕ͨ͘͞Μʂ ▸ GitlabCEΛཱͯͯίʔυϨϏϡʔ(๑•̀ŷ•́)و✧ ▸ GitlabCIͰࣗಈςετ(๑•̀ŷ•́)و✧ ▸ WebhookͰChatOps(๑•̀ŷ•́)و✧ ▸ Gitͷ෍ڭ(๑•̀ŷ•́)و✧

Slide 14

Slide 14 text

ͨͩɺ໰୊΋͋Δʂ ▸ Subgit͕݁ߏϝϞϦΛ৯͏ʀɻʀ ▸ ϓϩδΣΫτͷ౎߹্ɺݱࡏ12ݸͷRepositoryΛಉظத ▸ ݱࡏɺGitlabʹ͸RAMΛ8.5GׂΓ͋ͯͯΔ USER PID %CPU %MEM VSZ RSS git 1628 0.2 2.0 4115984 176568 ? Ssl Aug03 140:12 git 2402 0.5 4.8 4121252 423556 ? Ssl Aug14 294:30 git 12876 0.2 2.6 4118180 232660 ? Ssl Aug03 149:18 git 19817 0.2 2.2 4118304 199232 ? Ssl Aug03 146:00 git 23842 0.2 2.6 4115984 229092 ? Ssl Aug03 145:12 git 24513 0.2 2.7 4115984 238928 ? Ssl Aug03 148:40 git 25977 0.2 3.1 4115984 274436 ? Ssl Aug03 145:21 git 26915 0.5 5.4 4121116 476892 ? Ssl Aug09 308:55 git 27631 0.6 6.9 4118032 603960 ? Ssl Sep15 34:56 git 31213 0.2 2.6 4115984 233760 ? Ssl Aug03 150:43 git 31714 0.6 4.9 4121408 432184 ? Ssl Aug14 326:45 git 32111 0.2 1.9 4115984 172748 ? Ssl Aug03 152:39

Slide 15

Slide 15 text

ͨͩɺ໰୊΋͋Δʂ ▸ SubgitͷDaemon͕ϝϞϦෆ଍Ͱ͓ͳ͘ͳΓʹ ▸ ؂ࢹͯ͠ࢮΜͰͨΒੜ͖ฦ͢Α͏ʹ͢Δ ▸ subgit install —recover {git_repository} ▸ ͍ͨͩͭ͜΋݁ߏ͕͔͔࣌ؒΔʀ ▸ ͦͷؒɺಉظ͕ࢭ·ͬͯ͠·͏ͷͰGitlab಺ͰϚʔδ͕Ͱ ͖ͳ͘ͳͬͨΓɺPushΠϕϯτ͕͜ͳ͘ͳΔ ▸ ݱঢ়͸ϝϞϦageageͰઓͬͯΔ͚ͲɺͲ͏ʹ͔͍ͨ͠ƅ ƅ´ωAƅ ƅŇűƅŖ

Slide 16

Slide 16 text

ಋೖͯ͠Α͔ͬͨ͜ͱʂ ▸ Gitܦݧ͕ͳ͔ͬͨϝϯόʔ͕Gitʹ৮ΕΔ͍͍ػձ͕Ͱ͖ͨ ▸ ׬શҠߦͰ͸ͳ͘ಉظͳͷͰɺಋೖίετ͕ͱͯ΋গͳ͍ ▸ GitlabͰLGTMը૾ͰΈΜͳϫΠϫΠ΍ͬͯͯ࠷ߴʂ ▸ ΤϯδχΞ಺ͷίϛϡχέʔγϣϯ͕׆ൃʹʂ

Slide 17

Slide 17 text

͝ਗ਼ௌ ͋Γ͕ͱ͏͍͟͝·ͨ͠