diff options
| -rw-r--r-- | .github/workflows/deploy.yml | 38 | ||||
| -rw-r--r-- | LICENCE | 2 | ||||
| -rw-r--r-- | src/frontend/app/routes/about.tsx | 2 | ||||
| -rw-r--r-- | src/frontend/public/pwa-worker.js | 5 |
4 files changed, 7 insertions, 40 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eb7f109..19a5936 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -92,34 +92,14 @@ jobs: path: dist/backend retention-days: 7 - build-stops-script: - runs-on: ubuntu-latest - name: Build stop report script - needs: detect-changes - if: needs.detect-changes.outputs.stops-script == 'true' - environment: EnMarcha Prod - permissions: - contents: read - steps: - - uses: actions/checkout@v6 - with: - submodules: true - lfs: false - - name: Archive Stop Report Script Artifact - uses: actions/upload-artifact@v5 - with: - name: stop_report - path: src/gtfs_perstop_report/ - deploy: runs-on: ubuntu-latest - needs: [detect-changes, build-frontend, build-backend, build-stops-script] + needs: [detect-changes, build-frontend, build-backend] if: | always() && needs.detect-changes.result == 'success' && (needs.build-frontend.result == 'success' || - needs.build-backend.result == 'success' || - needs.build-stops-script.result == 'success') + needs.build-backend.result == 'success') name: Deploy to production server environment: EnMarcha Prod steps: @@ -135,12 +115,6 @@ jobs: with: name: backend path: dist/backend - - name: Download Stop Report Script Artifact - if: needs.detect-changes.outputs.stops-script == 'true' - uses: actions/download-artifact@v6 - with: - name: stop_report - path: dist/gtfs_perstop_report - name: Connect to tailnet uses: tailscale/github-action@v4 with: @@ -163,7 +137,7 @@ jobs: - name: Deploy frontend if: needs.detect-changes.outputs.frontend == 'true' run: | - scp -r dist/frontend/* ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:${{ secrets.TARGET_PATH }}/ + scp -r dist/frontend/* ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:/var/www/enmarcha/ - name: Stop service if: needs.detect-changes.outputs.backend == 'true' @@ -180,9 +154,3 @@ jobs: - name: Start service if: needs.detect-changes.outputs.backend == 'true' run: ssh ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }} "echo ${{ secrets.TARGET_PASSWORD }} | sudo -S /usr/bin/systemctl start enmarcha" - - - name: Deploy stop report script - if: needs.detect-changes.outputs.stops-script == 'true' - run: | - scp -r dist/gtfs_perstop_report/* ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:/opt/gtfs_vigo_stops/ - ssh ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }} "/opt/gtfs_vigo_stops/force-update.sh" @@ -1,4 +1,4 @@ -© Copyright 2024-2025 Ariel Costas +© Copyright 2024-2026 Ariel Costas Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/frontend/app/routes/about.tsx b/src/frontend/app/routes/about.tsx index 5158330..8ba015d 100644 --- a/src/frontend/app/routes/about.tsx +++ b/src/frontend/app/routes/about.tsx @@ -114,7 +114,7 @@ export default function About() { <p className="flex flex-wrap items-center gap-1"> <span className="opacity-80">{t("about.open_source")}</span> <a - href="https://github.com/arielcostas/busurbano" + href="https://github.com/arielcostas/enmarcha" className="text-blue-600 dark:text-blue-400 hover:underline hover:brightness-110 transition-all font-medium inline-flex items-center gap-1" rel="nofollow noreferrer noopener" target="_blank" diff --git a/src/frontend/public/pwa-worker.js b/src/frontend/public/pwa-worker.js index 6e33776..c81063f 100644 --- a/src/frontend/public/pwa-worker.js +++ b/src/frontend/public/pwa-worker.js @@ -1,9 +1,8 @@ -const CACHE_VERSION = "20251122a"; +const CACHE_VERSION = "20260101a"; const STATIC_CACHE_NAME = `static-cache-${CACHE_VERSION}`; const STATIC_CACHE_ASSETS = ["/favicon.ico", "/logo-256.png", "/logo-512.jpg"]; -const EXPR_CACHE_AFTER_FIRST_VIEW = - /(\/assets\/.*)|(\/api\/(vigo)\/GetStopTimetable.*)/; +const EXPR_CACHE_AFTER_FIRST_VIEW = /(\/assets\/.*)/; const ESTIMATES_MIN_AGE = 15 * 1000; const ESTIMATES_MAX_AGE = 30 * 1000; |