Fix merge conflict
This commit is contained in:
commit
f31d6524b6
@ -23,6 +23,14 @@ jobs:
|
||||
run: |
|
||||
zola build
|
||||
|
||||
- name: Set Destination Folder if MASTER
|
||||
if: ${{ github.ref == 'refs/heads/master' }}
|
||||
run: echo "DEST_FOLDER=/srv/www/cz/pkmples/www" >> $GITHUB_ENV
|
||||
|
||||
- name: Set Destination Folder if DEV
|
||||
if: ${{ github.ref == 'refs/heads/dev' }}
|
||||
run: echo "DEST_FOLDER=/srv/www/cz/pkmples/dev" >> $GITHUB_ENV
|
||||
|
||||
- name: Deploy to server
|
||||
uses: AEnterprise/rsync-deploy@v1.0.2
|
||||
env:
|
||||
@ -32,5 +40,5 @@ jobs:
|
||||
FOLDER: "./public/"
|
||||
SERVER_IP: ${{ secrets.SERVER_IP }}
|
||||
USERNAME: ${{ secrets.USERNAME }}
|
||||
SERVER_DESTINATION: ${{ if(github.ref == 'refs/heads/master') }}/srv/www/cz/pkmples/www${{ else }}/srv/www/cz/pkmples/dev${{ endif }
|
||||
SERVER_DESTINATION: ${{ env.DEST_FOLDER }}
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -7,5 +7,4 @@ author = "Jaroslav Valkoun"
|
||||
+++
|
||||
|
||||
Nějákou fotku hodíme i exkluzivně sem na web, ale nezapomeň sledovat náš [instagram](https://www.instagram.com/pkm.hub), kde toho je mnohem víc!
|
||||
<br>
|
||||
<img src="/img/posts/pkm_nataceni_1.jpg" alt="pkm nataceni" width="200">
|
@ -7,7 +7,6 @@ author = "Jaroslav Valkoun"
|
||||
+++
|
||||
|
||||
Připomeňte si promo videa z minulého roku! Na kanále najdete všechny 4, co říkáte na náhledovky? :D
|
||||
<br>
|
||||
<iframe
|
||||
class="video"
|
||||
src="https://www.youtube.com/embed/cmnqp2M_21Q?si=rzZ4skoIBs7i6Cg7"
|
@ -8,5 +8,4 @@ pinned = true
|
||||
+++
|
||||
|
||||
Vstupenky nyní můžete koupit [ZDE](https://www.kulturaturnov.cz/program/pkm-party-ples-2024) v předprodeji na stránkách KC Turnov!
|
||||
<br>
|
||||
<img src="/img/posts/party_ples_2024_plakat.jpg" alt="pkm plakat 2024" width="200">
|
@ -39,4 +39,7 @@
|
||||
max-width: none !important;
|
||||
min-width: 0 !important;
|
||||
}
|
||||
img, iframe, br {
|
||||
margin-top: 1rem !important;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user