Skip to content

Commit 13bebec

Browse files
madhephaestusmadhephaestus
committed
Auto-merge from CI
2 parents 52b002a + a45ece6 commit 13bebec

File tree

92 files changed

+1554
-1542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1554
-1542
lines changed

‎_config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ destination: ./docs/
1010
# username defaults to ENV['GIT_NAME'] used by Travis
1111
# repo defaults to USERNAME.github.io
1212
# Branch defaults to "source" for USERNAME.github.io
13-
1413
# or "master" otherwise
1514
username: CommonWealthRobotics
1615
repo: CommonWealthRobotics.github.io

‎deploy.sh‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,46 @@
11
#!/bin/bash
2+
3+
set -e
4+
5+
mv docs/maven/ ./maven/
6+
7+
rm -rf docs
8+
9+
git fetch origin
10+
211
git log -1
312
git config user.email "mad.hephaestus@gmail.com"
413
git config user.name "Kevin Harrington"
514
git config pull.rebase false
615
git config core.mergeoptions --no-edit
7-
set -e
8-
mv docs/maven/ ./maven/
9-
rm -rf docs
1016

11-
bash compile.sh
17+
git checkout source
1218

13-
mv ./maven/ docs/
19+
git update-index --assume-unchanged ./.github/workflows/publish.yml
20+
21+
git merge origin/deploy --strategy-option ours --no-ff --no-edit --allow-unrelated-histories -m "Auto-merge from CI "
22+
23+
git checkout deploy
24+
25+
git pull --allow-unrelated-histories
26+
27+
git merge source --strategy-option ours --no-ff --no-edit --allow-unrelated-histories -m "Auto-merge from CI "
28+
29+
git pull . source --allow-unrelated-histories
30+
31+
32+
bash compile.sh
1433

1534
set +e
1635

1736
echo "commonwealthrobotics.com" >./docs/CNAME
1837

38+
mv ./maven/ docs/
39+
1940
git add --all .
2041

2142
git commit -a -m"Update for deploy"
2243

23-
git push --force
44+
git push --force
45+
46+
git checkout source

‎docs/Bowler-Kinematics/index.html‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,81 +76,83 @@
7676

7777
<div class="bs-docs-sidebar hidden-print affix-top">
7878

79-
<a href="../legal/" class="btn btn-default navbtn pull-left btn-sm" aria-label="Left Align">
79+
<a href="../Mobile-Base-Control/" class="btn btn-default navbtn pull-left btn-sm" aria-label="Left Align">
8080
<span aria-hidden="true"></span>
8181
Previous
8282
</a>
8383

8484

85-
<a href="/tutorials/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
86-
More
87-
<span aria-hidden="true"></span></a>
88-
<br>
85+
<a href="../JavaCAD/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
86+
Next
87+
<span aria-hidden="true"></span>
88+
89+
90+
</a><br>
8991
<ul class="nav bs-docs-sidenav active" data-spy="active" data-offset-top="25" data-offset-bottom="20">
9092
<li><strong>CommonWealth Robotics Documentation</strong><hr class="menuhr" /></li>
9193

9294
<li >
93-
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
95+
<a href="../Bowler-Protocol/">Bowler Protocol</a></li>
9496

9597

9698
<li >
97-
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
99+
<a href="../kickstarter/">Kickstarter</a></li>
98100

99101

100102
<li >
101-
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
103+
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
102104

103105

104106
<li >
105-
<a href="../tutorials/">Documentation</a></li>
107+
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
106108

107109

108110
<li >
109-
<a href="../BowlerStudio/">BowlerStudio</a></li>
111+
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
110112

111113

112-
<li >
113-
<a href="../kickstarter/">Kickstarter</a></li>
114+
<li class="active" >
115+
<a href="./">Bowler Kinematics</a></li>
114116

115117

116118
<li >
117-
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
119+
<a href="../JavaCAD/">JavaCAD</a></li>
118120

119121

120122
<li >
121-
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
123+
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
122124

123125

124126
<li >
125-
<a href="../404/">content/404.html</a></li>
127+
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
126128

127129

128130
<li >
129-
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
131+
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
130132

131133

132134
<li >
133-
<a href="../Bowler-Protocol/">Bowler Protocol</a></li>
135+
<a href="../Bowler-Studio-Features/">BowlerStudio Features</a></li>
134136

135137

136138
<li >
137-
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
139+
<a href="../BowlerStudio/">BowlerStudio</a></li>
138140

139141

140142
<li >
141-
<a href="../JavaCAD/">JavaCAD</a></li>
143+
<a href="../tutorials/">Documentation</a></li>
142144

143145

144146
<li >
145-
<a href="../Bowler-Studio-Features/">BowlerStudio Features</a></li>
147+
<a href="../404/">content/404.html</a></li>
146148

147149

148150
<li >
149151
<a href="../legal/">Neuron Robotics Documentation</a></li>
150152

151153

152-
<li class="active" >
153-
<a href="./">Bowler Kinematics</a></li>
154+
<li >
155+
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
154156

155157

156158
</ul> <!-- nav bs-docs-sidenav -->

‎docs/Bowler-Protocol/index.html‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,9 @@
7676

7777
<div class="bs-docs-sidebar hidden-print affix-top">
7878

79-
<a href="../SimpleJavaTutorial/" class="btn btn-default navbtn pull-left btn-sm" aria-label="Left Align">
80-
<span aria-hidden="true"></span>
81-
Previous
82-
</a>
8379

8480

85-
<a href="../DyIO-First-Steps/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
81+
<a href="../kickstarter/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
8682
Next
8783
<span aria-hidden="true"></span>
8884

@@ -91,68 +87,68 @@
9187
<ul class="nav bs-docs-sidenav active" data-spy="active" data-offset-top="25" data-offset-bottom="20">
9288
<li><strong>CommonWealth Robotics Documentation</strong><hr class="menuhr" /></li>
9389

94-
<li >
95-
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
90+
<li class="active" >
91+
<a href="./">Bowler Protocol</a></li>
9692

9793

9894
<li >
99-
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
95+
<a href="../kickstarter/">Kickstarter</a></li>
10096

10197

10298
<li >
103-
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
99+
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
104100

105101

106102
<li >
107-
<a href="../tutorials/">Documentation</a></li>
103+
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
108104

109105

110106
<li >
111-
<a href="../BowlerStudio/">BowlerStudio</a></li>
107+
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
112108

113109

114110
<li >
115-
<a href="../kickstarter/">Kickstarter</a></li>
111+
<a href="../Bowler-Kinematics/">Bowler Kinematics</a></li>
116112

117113

118114
<li >
119-
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
115+
<a href="../JavaCAD/">JavaCAD</a></li>
120116

121117

122118
<li >
123-
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
119+
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
124120

125121

126122
<li >
127-
<a href="../404/">content/404.html</a></li>
123+
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
128124

129125

130126
<li >
131-
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
127+
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
132128

133129

134-
<li class="active" >
135-
<a href="./">Bowler Protocol</a></li>
130+
<li >
131+
<a href="../Bowler-Studio-Features/">BowlerStudio Features</a></li>
136132

137133

138134
<li >
139-
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
135+
<a href="../BowlerStudio/">BowlerStudio</a></li>
140136

141137

142138
<li >
143-
<a href="../JavaCAD/">JavaCAD</a></li>
139+
<a href="../tutorials/">Documentation</a></li>
144140

145141

146142
<li >
147-
<a href="../Bowler-Studio-Features/">BowlerStudio Features</a></li>
143+
<a href="../404/">content/404.html</a></li>
148144

149145

150146
<li >
151147
<a href="../legal/">Neuron Robotics Documentation</a></li>
152148

153149

154150
<li >
155-
<a href="../Bowler-Kinematics/">Bowler Kinematics</a></li>
151+
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
156152

157153

158154
</ul> <!-- nav bs-docs-sidenav -->

‎docs/Bowler-Studio-Features/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676

7777
<div class="bs-docs-sidebar hidden-print affix-top">
7878

79-
<a href="../JavaCAD/" class="btn btn-default navbtn pull-left btn-sm" aria-label="Left Align">
79+
<a href="../Bowler-Studio-Hardware/" class="btn btn-default navbtn pull-left btn-sm" aria-label="Left Align">
8080
<span aria-hidden="true"></span>
8181
Previous
8282
</a>
8383

8484

85-
<a href="../legal/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
85+
<a href="../BowlerStudio/" class="btn btn-default navbtn btn-sm" aria-label="Right Align">
8686
Next
8787
<span aria-hidden="true"></span>
8888

@@ -92,67 +92,67 @@
9292
<li><strong>CommonWealth Robotics Documentation</strong><hr class="menuhr" /></li>
9393

9494
<li >
95-
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
95+
<a href="../Bowler-Protocol/">Bowler Protocol</a></li>
9696

9797

9898
<li >
99-
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
99+
<a href="../kickstarter/">Kickstarter</a></li>
100100

101101

102102
<li >
103-
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
103+
<a href="../BowlerFullStack/">Bowler Arduino/Java</a></li>
104104

105105

106106
<li >
107-
<a href="../tutorials/">Documentation</a></li>
107+
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
108108

109109

110110
<li >
111-
<a href="../BowlerStudio/">BowlerStudio</a></li>
111+
<a href="../Mobile-Base-Control/">MobileBase Control</a></li>
112112

113113

114114
<li >
115-
<a href="../kickstarter/">Kickstarter</a></li>
115+
<a href="../Bowler-Kinematics/">Bowler Kinematics</a></li>
116116

117117

118118
<li >
119-
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
119+
<a href="../JavaCAD/">JavaCAD</a></li>
120120

121121

122122
<li >
123-
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
123+
<a href="../DyIO-Programming/">DyIO Programming Examples</a></li>
124124

125125

126126
<li >
127-
<a href="../404/">content/404.html</a></li>
127+
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
128128

129129

130130
<li >
131-
<a href="../SimpleJavaTutorial/">A Simple Java Tutorial</a></li>
131+
<a href="../Bowler-Studio-Hardware/">BowlerStudio Hardware</a></li>
132132

133133

134-
<li >
135-
<a href="../Bowler-Protocol/">Bowler Protocol</a></li>
134+
<li class="active" >
135+
<a href="./">BowlerStudio Features</a></li>
136136

137137

138138
<li >
139-
<a href="../DyIO-First-Steps/">DyIO First Steps</a></li>
139+
<a href="../BowlerStudio/">BowlerStudio</a></li>
140140

141141

142142
<li >
143-
<a href="../JavaCAD/">JavaCAD</a></li>
143+
<a href="../tutorials/">Documentation</a></li>
144144

145145

146-
<li class="active" >
147-
<a href="./">BowlerStudio Features</a></li>
146+
<li >
147+
<a href="../404/">content/404.html</a></li>
148148

149149

150150
<li >
151151
<a href="../legal/">Neuron Robotics Documentation</a></li>
152152

153153

154154
<li >
155-
<a href="../Bowler-Kinematics/">Bowler Kinematics</a></li>
155+
<a href="../JBullet-Physics/">JBullet Physics Engine</a></li>
156156

157157

158158
</ul> <!-- nav bs-docs-sidenav -->

0 commit comments

Comments
 (0)