From 143b5a8d8086d226d0b087c52bbf01a4a61b6864 Mon Sep 17 00:00:00 2001 From: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com> Date: Mon, 26 Sep 2022 12:39:01 +0530 Subject: [PATCH] revert: remove builder workflow to automate deployments on `ghcr.io` Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com> --- .github/workflows/builder.yml | 51 ---------------------------------- .github/workflows/ci.yml | 7 ----- .github/workflows/pipeline.yml | 14 +++------- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/builder.yml diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml deleted file mode 100644 index 3033c7a..0000000 --- a/.github/workflows/builder.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: 'Setup Docker Image(s)' - -on: - workflow_call: - inputs: - branch: - description: 'The branch for the workflow' - default: 'dev' - required: true - type: string -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -permissions: - contents: read - packages: write - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Check out repository ๐ŸŽ‰ - uses: actions/checkout@v3 - - - name: Set up Docker Buildx ๐Ÿ— - uses: docker/setup-buildx-action@v2 - with: - buildkitd-flags: --debug - - - name: Log in to the Container registry ๐Ÿ” - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker ๐Ÿ™๐Ÿฝ - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image ๐Ÿฆพ - uses: docker/build-push-action@v3.1.1 - with: - context: . - file: Dockerfile - push: true - tags: ${{ steps.meta.outputs.tags }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.branch }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76facac..d91256b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,10 +7,6 @@ permissions: checks: write contents: read -concurrency: - group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }} - cancel-in-progress: true - jobs: ci: runs-on: ubuntu-latest @@ -49,6 +45,3 @@ jobs: with: dockerfile: Dockerfile ignore: DL3003,DL3008 - - # - name: Run tests ๐Ÿงช - # run: npm run test diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index f86db21..8e51ac4 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -8,6 +8,10 @@ on: branches: - master +concurrency: + group: ci-${{ github.ref }}-1 + cancel-in-progress: true + jobs: extract-branch: name: 'Fetch branch' @@ -34,13 +38,3 @@ jobs: needs: - extract-branch uses: maptiler/tileserver-gl/.github/workflows/ct.yml@master - builder: - name: 'Build & Publish Docker Image(s)' - needs: - - extract-branch - - ci - - ct - if: ${{ github.event_name == 'push' }} - uses: maptiler/tileserver-gl/.github/workflows/builder.yml@master - with: - branch: ${{ needs.extract-branch.outputs.current_branch }}