From c9a055a931a62ff39efb98a4512b0379f23e0af9 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Sat, 4 Jan 2025 19:49:05 +0100 Subject: [PATCH] revert deploy --- .github/workflows/deploy.yml | 38 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 11482698..4242b02a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: deploy on: push: - branches: [ globe ] + branches: [ main ] jobs: deploy-pages: @@ -29,25 +29,23 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: dist + # publish docker to GitHub registry + deploy-docker: + name: deploy/docker + runs-on: ubuntu-latest + if: ${{ github.event_name == 'push' }} - # # publish docker to GitHub registry - # deploy-docker: - # name: deploy/docker - # runs-on: ubuntu-latest + strategy: + fail-fast: false - # if: ${{ github.event_name == 'push' }} - - # strategy: - # fail-fast: false - - # steps: - # - name: Login to GitHub Container Registry - # uses: docker/login-action@v3 - # with: - # registry: ghcr.io - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - # - uses: actions/checkout@v4 - # - run: docker build -t ghcr.io/maplibre/maputnik:main . - # - run: docker push ghcr.io/maplibre/maputnik:main + steps: + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 + - run: docker build -t ghcr.io/maplibre/maputnik:main . + - run: docker push ghcr.io/maplibre/maputnik:main