diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 53fc3e492..b84fb03b0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -76,7 +76,7 @@ jobs: uses: actions/configure-pages@v4 - name: Upload to GitHub Pages - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v4 with: path: _site/ diff --git a/.github/workflows/test-multilingual.yml b/.github/workflows/test-multilingual.yml index 22ae41a01..9a02c1739 100644 --- a/.github/workflows/test-multilingual.yml +++ b/.github/workflows/test-multilingual.yml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: ruby-version: '3.3.5' bundler-cache: true - cache-version: 1 - name: Setup Node.js uses: actions/setup-node@v4 @@ -26,30 +26,37 @@ jobs: node-version: '20.18.0' cache: 'npm' - - name: Install Node dependencies - run: npm ci + - name: Install Node dependencies (production only) + run: npm ci --only=production - - name: Verify Ruby and Bundle setup + - name: Verify setup run: | - ruby --version - bundle --version - bundle list + echo "Ruby version: $(ruby --version)" + echo "Bundle version: $(bundle --version)" + echo "Node version: $(node --version)" + echo "NPM version: $(npm --version)" + echo "Checking bundler gems..." + bundle list --paths - name: Run Jekyll build - run: bundle exec jekyll build --config _config.yml + run: bundle exec jekyll build --config _config.yml --verbose + env: + BUNDLE_PATH: vendor/bundle + BUNDLE_JOBS: 4 + BUNDLE_RETRY: 3 - name: Run multilingual tests - run: chmod +x ./test-multilingual.sh && ./test-multilingual.sh - - - name: Check for broken links (sample) run: | - # Basic link verification for main pages - for lang in "" "fr/" "es/" "cs/"; do - echo "Checking ${lang:-en} pages..." - if [ -f "_site/${lang}about/index.html" ]; then - echo "✅ ${lang:-en}about page exists" - else - echo "❌ ${lang:-en}about page missing" - exit 1 - fi - done \ No newline at end of file + chmod +x ./test-multilingual.sh + ./test-multilingual.sh + + - name: Upload build artifacts on failure + uses: actions/upload-artifact@v4 + if: failure() + with: + name: build-artifacts + path: | + _site/ + .jekyll-cache/ + Gemfile.lock + retention-days: 5 \ No newline at end of file diff --git a/.github/workflows/update-events.yml b/.github/workflows/update-events.yml index 535ce35de..56d737447 100644 --- a/.github/workflows/update-events.yml +++ b/.github/workflows/update-events.yml @@ -30,8 +30,8 @@ jobs: node-version: '20' cache: 'npm' - - name: Install dependencies - run: npm install --only=production + - name: Install Node.js dependencies + run: npm ci --only=production - name: Fetch latest events run: node fetch-events.cjs diff --git a/app/.jekyll-metadata b/app/.jekyll-metadata index 275e0fb35..ea40476d2 100644 Binary files a/app/.jekyll-metadata and b/app/.jekyll-metadata differ diff --git a/app/assets/data/events.json b/app/assets/data/events.json index 4ea86f265..99d8c4e95 100644 --- a/app/assets/data/events.json +++ b/app/assets/data/events.json @@ -1,5 +1,5 @@ { - "buildTime": "2025-10-03T00:24:35.976Z", + "buildTime": "2025-10-03T00:56:22.749Z", "count": 15, "events": [ { diff --git a/package.json b/package.json index 52b8f83d5..6fdd879af 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "npm": ">=10.0.0" }, "bugs": { - "url": "" + "url": "https://github.com/MissingMaps/missingmaps.github.io/issues" }, - "homepage": "", + "homepage": "https://www.missingmaps.org", "scripts": { "postinstall": "[ -f _config-dev.yml ] || echo 'domain: http://localhost:3000\npath_prefix:' > _config-dev.yml", "serve": "gulp serve", @@ -29,8 +29,7 @@ "lint": "eslint app/assets/scripts/**/*.js updatedep.js", "lint:fix": "eslint app/assets/scripts/**/*.js updatedep.js --fix", "test": "npm run lint && npm run build", - "clean": "gulp clean", - "install": "bundle install" + "clean": "gulp clean" }, "browserify": { "transform": [