Skip to content

Commit bf1fba6

Browse files
committed
Adjust docs folder to match user guide
1 parent 8952580 commit bf1fba6

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

admin/release

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,11 @@ cd user_guide_src
8787

8888
# make the UG & embed it in the project root
8989
make html
90-
rm -Rf ../UserGuide
91-
mv build/html ../UserGuide
90+
rm -Rf ../docs
91+
mv build/html ../docs
9292

93-
# make the epub & stick it in the project's "build" folder for now
93+
# make the epub, but leave it inside the gitignored user_guide_src to deal with separately
9494
make epub
95-
mv build/epub/CodeIgniter4.epub "../build/CodeIgniter-UserGuide-${version}${qualifier}.epub"
9695

9796
cd ..
9897

@@ -136,13 +135,14 @@ echo -e "${BOLD}Merge the release into master${NORMAL}"
136135
git checkout master
137136
git merge $branch
138137
git push UPSTREAM master
138+
git push UPSTREAM --tags
139139

140140
#---------------------------------------------------
141141
# Put our house back in order
142142
echo -e "${BOLD}Put our house back in order${NORMAL}"
143143

144144
mv -r admin/previous-gitignore .gitignore
145-
rm -Rf UserGuide
145+
rm -Rf docs
146146
rm -f build/*.epub
147147

148148
#---------------------------------------------------
@@ -168,7 +168,8 @@ git merge master
168168
git push origin develop
169169
git push UPSTREAM develop
170170

171-
git branch -d $branch
171+
# keep or delete the release branch? up to you
172+
#git branch -d $branch
172173

173174
#---------------------------------------------------
174175
# Phew!

0 commit comments

Comments
 (0)