deploy all

hiddewie · Aug 5, 2024 · e45c25c · e45c25c
1 parent 2e39293
commit e45c25c
Showing 1 changed file with 88 additions and 88 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,94 +24,94 @@ jobs:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
         run: |
           flyctl deploy --config proxy.fly.toml --local-only
-#
-#  generate-tiles:
-#    name: Generate tiles
-#    runs-on: ubuntu-latest
-#
-#    strategy:
-#      matrix:
-#        tiles:
-#          - low-med
-#          - high
-#          - standard
-#          - speed
-#          - signals
-#          - electrification
-#
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#
-#      - name: Login to GitHub Container Registry
-#        uses: docker/login-action@v3
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#
-#      - name: Pull database
-#        run: |
-#          docker compose pull db
-#          docker compose up --no-build --pull never --wait db
-#
-#      - name: Generate tiles
-#        env:
-#          TILES: ${{ matrix.tiles }}
-#          BBOX: '-10.0,35.7,39.0,70.0'
-#        run: |
-#          docker compose run martin-cp
-#          ls -las tiles/
-#
-#      - uses: actions/upload-artifact@v4
-#        with:
-#          name: tiles-${{ matrix.tiles }}
-#          path: |
-#            tiles/*.mbtiles
-#          if-no-files-found: error
-#          retention-days: 3
-#
-#  deploy-tiles:
-#    name: Deploy tiles
-#    runs-on: ubuntu-latest
-#    needs: generate-tiles
-#    environment: tiles-production
-#
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#
-#      - name: Setup Fly
-#        uses: superfly/flyctl-actions/setup-flyctl@master
-#
-#      - name: Login to GitHub Container Registry
-#        uses: docker/login-action@v3
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#
-#      - uses: actions/download-artifact@v4
-#        with:
-#          # No name: download everything
-#          path: tiles
-#          merge-multiple: true
-#
-#      - name: List generated tiles
-#        run: |
-#          ls -lah tiles/
-#
-#      - name: Deploy
-#        env:
-#          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-#        run: |
-#          flyctl deploy --config martin-static.fly.toml --local-only
+
+  generate-tiles:
+    name: Generate tiles
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        tiles:
+          - low-med
+          - high
+          - standard
+          - speed
+          - signals
+          - electrification
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull database
+        run: |
+          docker compose pull db
+          docker compose up --no-build --pull never --wait db
+
+      - name: Generate tiles
+        env:
+          TILES: ${{ matrix.tiles }}
+          BBOX: '-10.0,35.7,39.0,70.0'
+        run: |
+          docker compose run martin-cp
+          ls -las tiles/
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: tiles-${{ matrix.tiles }}
+          path: |
+            tiles/*.mbtiles
+          if-no-files-found: error
+          retention-days: 3
+
+  deploy-tiles:
+    name: Deploy tiles
+    runs-on: ubuntu-latest
+    needs: generate-tiles
+    environment: tiles-production
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Setup Fly
+        uses: superfly/flyctl-actions/setup-flyctl@master
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/download-artifact@v4
+        with:
+          # No name: download everything
+          path: tiles
+          merge-multiple: true
+
+      - name: List generated tiles
+        run: |
+          ls -lah tiles/
+
+      - name: Deploy
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+        run: |
+          flyctl deploy --config martin-static.fly.toml --local-only
 
   deploy-api:
     name: Deploy API