From 978ea9e809c65d005e57150d6bafa9feff992769 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 3 May 2021 17:55:29 +0100 Subject: [PATCH] Delete Gitlab config --- .github/workflows/test.yml | 2 +- .gitlab-ci.yml | 22 ---------------------- utils/{gitlabci => ci}/config.cfg | 0 utils/{gitlabci => ci}/config.env | 0 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .gitlab-ci.yml rename utils/{gitlabci => ci}/config.cfg (100%) rename utils/{gitlabci => ci}/config.env (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c13d17c..1147e08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Copy config - run: cp utils/gitlabci/* . + run: cp utils/ci/* . - name: Build the Docker image run: docker-compose build - name: Start Docker diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 6381efe..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,22 +0,0 @@ -image: docker/compose -services: - - docker:dind -cache: - key: "$CI_COMMIT_REF_SLUG" - paths: - - /var/lib/docker - -# build: -# stage: build -# script: -# - cp utils/gitlabci/* . -# - docker-compose build - -UI_Test: - stage: test - script: - - cp utils/gitlabci/* . - - docker-compose up -d - - ./utils/run_migrations.sh - - ./utils/tests_cov.sh - - docker-compose down diff --git a/utils/gitlabci/config.cfg b/utils/ci/config.cfg similarity index 100% rename from utils/gitlabci/config.cfg rename to utils/ci/config.cfg diff --git a/utils/gitlabci/config.env b/utils/ci/config.env similarity index 100% rename from utils/gitlabci/config.env rename to utils/ci/config.env