Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
subugoe
ahiqar
ahiqar-tido
Commits
5891d7eb
Commit
5891d7eb
authored
Sep 09, 2021
by
dindigala
Browse files
Merge branch 'develop' into 'main'
Ahikar - Tido Live instance update. See merge request subugoe/ahiqar/ahiqar-tido!45
parents
e2ef57e7
20932a79
Changes
4
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
5891d7eb
...
...
@@ -11,6 +11,24 @@
-
mkdir -p ~/.ssh
-
chmod 700 ~/.ssh
.deloyment
:
&deploy
# set entry point for develop
-
sed -i "s ahikar.*\.sub $SERVER.sub g" tido/dist/index.html
# arabic-karshuni
## remove old version
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$TARGET/frontend/arabic-karshuni/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$TARGET/frontend/arabic-karshuni/
# syriac
## remove old version
-
sed -i 's textapi/ahikar/arabic-karshuni textapi/ahikar/syriac/ g' tido/dist/index.html
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$TARGET/frontend/syriac/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$TARGET/frontend/syriac/
# upload css
-
scp -o 'StrictHostKeyChecking no' ahikar.css $SSH_USER@$SSH_IP:~/$TARGET/frontend/
## GLOBAL VARIABLES
variables
:
# ↓ needed to handle concurrency
...
...
@@ -61,57 +79,36 @@ build:
-
ahikar.css
update_backend-test
:
stage
:
update-backend
image
:
rsamban/scp-resource:latest
variables
:
TARGET
:
"
test"
SERVER
:
"
ahikar-test"
script
:
-
*ssh
-
*deploy
update_backend-develop
:
stage
:
update-backend
image
:
rsamban/scp-resource:latest
only
:
-
develop
variables
:
TARGET
:
"
develop"
SERVER
:
"
ahikar-dev"
script
:
-
*ssh
# set entry point for develop
-
sed -i "s ahikar.*\.sub ahikar-dev.sub g" tido/dist/index.html
# arabic-karshuni
## remove old version
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/*"
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/test/frontend/arabic-karshuni/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "cp -r ~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/* ~/test/frontend/arabic-karshuni/"
## set entry point for test
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "sed -i 's ahikar-dev.*\.sub ahikar-test.sub g' ~/test/frontend/arabic-karshuni/index.html"
# syriac
## remove old version
-
sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac/' tido/dist/index.html
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/syriac/*"
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/test/frontend/syriac/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/syriac/
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "cp -r ~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/* ~/test/frontend/syriac/"
## set entry point for test
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "sed -i 's ahikar-dev.*\.sub ahikar-test.sub g' ~/test/frontend/syriac/index.html"
# upload css
-
scp -o 'StrictHostKeyChecking no' ahikar.css $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/
-
scp -o 'StrictHostKeyChecking no' ahikar.css $SSH_USER@$SSH_IP:~/test/frontend/
-
*deploy
update_backend-main
:
stage
:
update-backend
image
:
rsamban/scp-resource:latest
only
:
-
main
variables
:
TARGET
:
"
main"
SERVER
:
"
ahikar"
script
:
-
*ssh
-
sed -i "s ahikar.*\.sub ahikar.sub g" tido/dist/index.html
# arabic-karshuni
## remove old version
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/arabic-karshuni/
# syriac
## remove old version
-
sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac/' tido/dist/index.html
-
ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/syriac/*"
## upload new version
-
scp -o 'StrictHostKeyChecking no' -r tido/dist/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/syriac/
# upload css
-
scp -o 'StrictHostKeyChecking no' ahikar.css $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/
-
*deploy
\ No newline at end of file
ahikar.css
View file @
5891d7eb
...
...
@@ -17,6 +17,12 @@ body {
font-size
:
133%
;
text-align
:
center
;
}
.ara
{
font-family
:
'Serto Jerusalem'
;
font-weight
:
normal
;
font-style
:
normal
;
}
.body
{
text-align
:
right
;
width
:
100%
;
}
...
...
@@ -93,8 +99,10 @@ body {
.syc
{
font-family
:
'Estrangelo Edessa'
;
font-weight
:
normal
;
font-style
:
normal
;
}
.quote.colophon
{
color
:
#700000
;
}
...
...
ahikar.scss
View file @
5891d7eb
...
...
@@ -18,6 +18,12 @@ body {
font-size
:
133%
;
text-align
:
center
;
}
.ara
{
font-family
:
'Serto Jerusalem'
;
font-weight
:
normal
;
font-style
:
normal
;
}
.body
{
text-align
:
right
;
width
:
100%
;
}
...
...
@@ -94,7 +100,9 @@ body {
.syc
{
font-family
:
'Estrangelo Edessa'
;
}
font-weight
:
normal
;
font-style
:
normal
;
}
.quote.colophon
{
color
:
#700000
;
}
...
...
tido
@
3c8543c2
Compare
81dbcf08
...
3c8543c2
Subproject commit
81dbcf0894b99e73754dbb616768a464dab009d3
Subproject commit
3c8543c245cd678ef6bc37b5835cf7347f1d531c
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment