From dd53f2888e24983d1c9aaa00d83caaa4adff2478 Mon Sep 17 00:00:00 2001 From: Justin Deal Date: Sat, 3 May 2025 15:46:46 -0700 Subject: [PATCH] Update deployment script --- .gitea/workflows/deploy.yml | 58 +++++------------------------------ astro.config.ci.mjs | 60 ------------------------------------- 2 files changed, 8 insertions(+), 110 deletions(-) delete mode 100644 astro.config.ci.mjs diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 5f3c515..4b0fd32 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -23,39 +23,15 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v2 - - - name: Free up disk space - run: | - # Display disk space before cleanup - df -h - - # Remove large packages without using regex - sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox mono-runtime - sudo apt-get autoremove -y - - # Remove large directories - sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache - - # Clean Docker (if installed) - if command -v docker &> /dev/null; then - docker system prune -af - fi - - # Display disk space after cleanup - df -h - - name: Install system dependencies - run: | - # Free up disk space - sudo rm -rf /var/lib/apt/lists/* - sudo apt-get clean - # Use compression to reduce download size - sudo apt-get update -o Acquire::CompressionTypes::Order::=gz - # Install minimal dependencies - sudo apt-get install -y --no-install-recommends rsync build-essential libvips-dev - # Clean up to save space - sudo apt-get clean - sudo rm -rf /var/lib/apt/lists/* + - name: Install Dependencies + run: | + sudo apt-get update + sudo apt-get install -y rsync build-essential libvips-dev + pnpm install + + - name: Build Site + run: pnpm run build - name: Setup SSH key run: | @@ -68,23 +44,5 @@ jobs: - name: Add server to known_hosts run: ssh-keyscan ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts - - name: Install dependencies - run: pnpm install - - - name: Build Astro site - run: | - echo "Attempting to build with Sharp..." - if pnpm run build; then - echo "Build with Sharp successful!" - else - echo "Build with Sharp failed, falling back to passthrough image service..." - # Copy the CI config to use the passthrough image service - cp astro.config.ci.mjs astro.config.mjs - # Clean the previous failed build - rm -rf dist - # Try building again with the passthrough config - pnpm run build - fi - - name: Deploy to server run: rsync -avzP ./dist/ root@${{ secrets.SERVER_IP }}:/var/www/html/ diff --git a/astro.config.ci.mjs b/astro.config.ci.mjs deleted file mode 100644 index 7fc4289..0000000 --- a/astro.config.ci.mjs +++ /dev/null @@ -1,60 +0,0 @@ -// @ts-check -import { defineConfig } from "astro/config"; -import tailwindcss from "@tailwindcss/vite"; - -// https://astro.build/config -export default defineConfig({ - site: 'https://justin.deal', - - // Performance optimizations - compressHTML: true, - - // Build optimizations - build: { - inlineStylesheets: 'auto', // Inline small stylesheets for better performance - }, - - // Image optimizations - using passthrough service for CI/CD - image: { - service: { - entrypoint: 'astro/assets/services/noop', - }, - }, - - // Vite configuration - vite: { - plugins: [tailwindcss()], - - // Build optimizations - build: { - // Enable chunk splitting - cssCodeSplit: true, - - // Optimize chunks - rollupOptions: { - output: { - // Customize chunk naming - manualChunks: { - // Group Alpine.js and related code - alpine: ['alpinejs'], - }, - }, - }, - }, - - // Optimize dependencies - optimizeDeps: { - include: ['alpinejs'], - }, - - // CSS optimization - css: { - devSourcemap: true, - }, - - // Enable server-side rendering optimizations - ssr: { - noExternal: ['@astrojs/tailwind'], - }, - }, -});