From 2169786c7e7f44e5ea0188594ca1983742841017 Mon Sep 17 00:00:00 2001 From: isUnknown Date: Thu, 4 Sep 2025 15:37:57 +0200 Subject: [PATCH] CI - improve --- .gitlab-ci.yml | 34 ++++++++++++---------------- src/components/project/PdfViewer.vue | 3 +-- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 988b0ee..3d856a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,24 +33,18 @@ deploy: script: - cd dist - | - sshpass -p "$PASSWORD" rsync -avz --delete -O \ - --exclude 'accounts/' \ - --exclude 'cache/' \ - --exclude 'sessions/' \ - -e "ssh -p 2244 -o StrictHostKeyChecking=no" \ - site/ $USERNAME@$HOST:$PROD_PATH/site/ + rsync_deploy() { + local src=$1 + local dst=$2 + local exclude=$3 + cmd="sshpass -p \"$PASSWORD\" rsync -az --itemize-changes --delete -O" + [[ -n $exclude ]] && cmd="$cmd $exclude" + cmd="$cmd -e 'ssh -p 2244 -o StrictHostKeyChecking=no' $src $USERNAME@$HOST:$dst" + echo "$cmd" + eval $cmd + } - sshpass -p "$PASSWORD" rsync -avz --delete -O \ - -e "ssh -p 2244 -o StrictHostKeyChecking=no" \ - vendor/ $USERNAME@$HOST:$PROD_PATH/vendor/ - - sshpass -p "$PASSWORD" rsync -avz --delete -O \ - -e "ssh -p 2244 -o StrictHostKeyChecking=no" \ - kirby/ $USERNAME@$HOST:$PROD_PATH/kirby/ - - sshpass -p "$PASSWORD" rsync -avz --delete -O \ - --exclude 'tiles/' \ - -e "ssh -p 2244 -o StrictHostKeyChecking=no" \ - assets/ $USERNAME@$HOST:$PROD_PATH/assets/ - dependencies: - - build + rsync_deploy site/ "$PROD_PATH/site/" "--exclude 'accounts/' --exclude 'cache/' --exclude 'sessions/'" + rsync_deploy vendor/ "$PROD_PATH/vendor/" + rsync_deploy kirby/ "$PROD_PATH/kirby/" + rsync_deploy assets/ "$PROD_PATH/assets/" "--exclude 'tiles/'" diff --git a/src/components/project/PdfViewer.vue b/src/components/project/PdfViewer.vue index 44fe245..90bf521 100644 --- a/src/components/project/PdfViewer.vue +++ b/src/components/project/PdfViewer.vue @@ -38,8 +38,7 @@ import { storeToRefs } from 'pinia'; import { VPdfViewer, useLicense } from '@vue-pdf-viewer/viewer'; const licenseKey = - import.meta.env.VITE_VPV_LICENSE ?? - 'eyJkYXRhIjoiZXlKMElqb2laR1YyWld4dmNHVnlJaXdpWVhaMUlqb3hOell3TVRRd056azVMQ0prYlNJNkltUmxjMmxuYm5SdmNHRmpheTVuY205MWNHVXRjRzlqYUdWMExtWnlJaXdpYmlJNklqY3lOVFU0T0dNeVl6VXlOR1prTVdNaUxDSmxlSEFpT2pFM09EZzFOall6T1Rrc0ltUnRkQ0k2SW5Od1pXTnBabWxqSWl3aWNDSTZJblpwWlhkbGNpSjkiLCJzaWduYXR1cmUiOiJwajRFT0dIZndyVkhqS0I5OE42cjhVWklwSndYc0VuU1pLUmZ6MVk1TlREaGJSQStsNXB5a2g3OUs4azhYclRSSFU1MVc2NnJYa0pyWFRmTm9qa0k0NWJnSzQwQlQzYmo5L3ZmWlRVV09sbWNrU0J2QmM1NUhGOUNNVWhFMGpnSkxGMmFubmlDaXhzQVdvQVZEWVpFL1pxb1pxSzY0ZVdKaEl5cW9ERFFZUGxFVy9Kb1dnTzlIZWluWEhob0RNY2IvTjdlajB2eTAzSnBVNHRZSTI0WlV5a1VXUmZCUm03d0VuTWwvMXlsUlBqRUU3RnVuaGM5SDQ1RXpaUno4QmR5eGgwS0RseGFwallzb2ZacE1LWGdNOXFEWTVUSDZ5WEpDcVlnVnpMRS9GdWVSN3RkRFA3ZFNYUC96K1JNQjhWbHNmSGhwNCtwSzJobXZQZ0ovU3RVc0E9PSJ9'; + import.meta.env.VITE_VPV_LICENSE ?? 'd0ab730a-ebba-4060-856c-76d322565645'; useLicense({ licenseKey }); const { openedFile, isCommentsOpen, comments, draftComment } = storeToRefs(