Merge pull request #574 from PAWECOGmbH/development

Dev to Staging
PAWECOGmbH · Dec 6, 2024 · 0ea9224 · 0ea9224
2 parents a6477fa + fd5e54c
commit 0ea9224
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -16,14 +16,52 @@ jobs:
       - name: Deploy to server via rsync
         uses: Burnett01/[email protected]
         with:
-          switches: -avzr --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
+          switches: -avzr --checksum --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
           path: ./
           remote_path: ${{ secrets.PROD_REMOTE_PATH }}
           remote_host: ${{ secrets.PROD_HOST }}
           remote_user: ${{ secrets.PROD_USER }}
           remote_key: ${{ secrets.PROD_KEY }}
           remote_key_pass: ${{ secrets.PROD_KEY_PASS }}
 
+      - name: Generate version and minify on server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.PROD_HOST }}
+          username: ${{ secrets.PROD_USER }}
+          key: ${{ secrets.PROD_KEY }}
+          passphrase: ${{ secrets.PROD_KEY_PASS }}
+          script: |
+            TIMESTAMP=$(date +%Y%m%d%H%M)
+            echo "{\"version\":\"$TIMESTAMP\"}" > ${{ secrets.PROD_REMOTE_PATH }}/www/frontend/custom_theme/css/version.json
+            echo "{\"version\":\"$TIMESTAMP\"}" > ${{ secrets.PROD_REMOTE_PATH }}/www/frontend/custom_theme/js/version.json
+
+            docker run --rm \
+              -v ${{ secrets.PROD_REMOTE_PATH }}/www:/www \
+              node:18 sh -c "npm install -g csso-cli && \
+              csso /www/frontend/custom_theme/css/styles.css --output /www/frontend/custom_theme/css/styles.min.css"
+
+            docker run --rm \
+              -v ${{ secrets.PROD_REMOTE_PATH }}/www:/www \
+              node:18 sh -c "npm install -g terser && \
+              terser /www/frontend/custom_theme/js/scripts.js --compress --mangle --output /www/frontend/custom_theme/js/scripts.min.js"
+
+      - name: Run Flyway Migrations core
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.PROD_HOST }}
+          username: ${{ secrets.PROD_USER }}
+          key: ${{ secrets.PROD_KEY }}
+          passphrase: ${{ secrets.PROD_KEY_PASS }}
+          script: |
+            docker run --rm \
+              --network npm_network \
+              --volume ${{ secrets.PROD_REMOTE_PATH }}/config/db/core:/flyway/core:ro \
+              -e FLYWAY_URL="${{ secrets.PROD_DB_URL }}" \
+              -e FLYWAY_USER="${{ secrets.PROD_DB_USER }}" \
+              -e FLYWAY_PASSWORD="${{ secrets.PROD_DB_PASSWORD }}" \
+              flyway/flyway -locations=filesystem:/flyway/core -table=flyway_core migrate
+
       - name: Run Flyway Migrations core
         uses: appleboy/[email protected]
         with:
@@ -54,4 +92,5 @@ jobs:
               -e FLYWAY_URL="${{ secrets.PROD_DB_URL }}" \
               -e FLYWAY_USER="${{ secrets.PROD_DB_USER }}" \
               -e FLYWAY_PASSWORD="${{ secrets.PROD_DB_PASSWORD }}" \
-              flyway/flyway -locations=filesystem:/flyway/myapp -table=flyway_myapp migrate
+              flyway/flyway -locations=filesystem:/flyway/myapp -table=flyway_myapp migrate
+
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Deploy to server via rsync
         uses: Burnett01/[email protected]
         with:
-          switches: -avzr --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
+          switches: -avzr --checksum --delete --exclude-from='.gitignore' --exclude='/config/nginx/conf.d/custom.conf'
           path: ./
           remote_path: ${{ secrets.STAGING_REMOTE_PATH }}
           remote_host: ${{ secrets.STAGING_HOST }}