From d7d84a667a30fbfd2a095ee4a691de9dae91e795 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 8 Feb 2023 12:10:57 +0100 Subject: Makefile: use docker-compose for make build First, it would actually build both images: cgitize and cgitize-frontend. Second, it's already tested in t/i/docker. --- .github/workflows/ci.yml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77ad7df..7f379d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,29 +36,7 @@ jobs: - name: Unit tests run: python -m unittest --buffer - build_docker: - runs-on: ubuntu-latest - name: 'Build / docker build' - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Build w/ docker build - run: make docker/build - - build_buildx: - runs-on: ubuntu-latest - name: 'Build / docker buildx' - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Build w/ docker buildx - run: | - make buildx/create - make buildx/build - make buildx/rm - test_docker: - needs: [test_local, build_docker, build_buildx] runs-on: ubuntu-latest name: 'Test / Docker' steps: @@ -68,7 +46,7 @@ jobs: run: sudo ./test/integration/docker/test.sh test_example_config: - needs: [test_local, build_docker, build_buildx] + needs: [test_local, test_docker] runs-on: ubuntu-latest name: 'Test / example config' env: -- cgit v1.2.3