Skip to content

Commit 23a4e68

Browse files
committed
simplify the source build
1 parent bf18777 commit 23a4e68

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

deploy.sh

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,9 @@ set -e
44

55
rm -rf docs
66

7-
git fetch origin
8-
9-
git log -1
10-
git config user.email "[email protected]"
11-
git config user.name "Kevin Harrington"
12-
git config pull.rebase false
13-
git config core.mergeoptions --no-edit
14-
15-
git checkout source
16-
17-
git update-index --assume-unchanged ./.github/workflows/publish.yml
18-
19-
git merge origin/deploy --strategy-option ours --no-ff --no-edit --allow-unrelated-histories -m "Auto-merge from CI "
20-
21-
git checkout deploy
22-
23-
git pull --allow-unrelated-histories
24-
25-
git merge source --strategy-option ours --no-ff --no-edit --allow-unrelated-histories -m "Auto-merge from CI "
26-
27-
git pull . source --allow-unrelated-histories
28-
297

308
bash compile.sh
319

3210
set +e
3311

34-
echo "commonwealthrobotics.com" >./docs/CNAME
35-
36-
git add --all .
37-
38-
git commit -a -m"Update for deploy"
39-
40-
git push --force
41-
42-
git checkout source
12+
echo "commonwealthrobotics.com" >./docs/CNAME

0 commit comments

Comments
 (0)