diff --git a/.github/workflows/ci-71.yml b/.github/workflows/ci-71.yml deleted file mode 100644 index 26a6f32c..00000000 --- a/.github/workflows/ci-71.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Magento 2.1 CI - -on: - - push - -jobs: - ci: - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v1 - - - name: Launch Magento test environment - run: make up-71 - - - name: Run install script - run: >- - docker-compose exec -T web bash -c 'dockerize -wait tcp://db:3306 -timeout 60m /usr/local/bin/install-magento' - env: - COMPOSE_INTERACTIVE_NO_CLI: "1" - - - name: Set Base URL - run: make fix-session-expire - - - uses: cypress-io/github-action@v2 - with: - project: ./test/e2e - env: - CYPRESS_API_KEY: ${{ secrets.API_KEY }} - CYPRESS_MAGENTO_VERSION: "2.2" diff --git a/.github/workflows/ci-72.yml b/.github/workflows/ci-72.yml deleted file mode 100644 index 50effaa4..00000000 --- a/.github/workflows/ci-72.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Magento 2.2 CI - -on: - - push - -jobs: - ci: - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v1 - - - name: Launch Magento test environment - run: make up-72 - - - name: Run install script - run: >- - docker-compose exec -T web bash -c 'dockerize -wait tcp://db:3306 -timeout 60m /usr/local/bin/install-magento' - env: - COMPOSE_INTERACTIVE_NO_CLI: "1" - - - name: Set Base URL - run: make fix-session-expire - - - uses: cypress-io/github-action@v2 - with: - project: ./test/e2e - env: - CYPRESS_API_KEY: ${{ secrets.API_KEY }} - CYPRESS_MAGENTO_VERSION: "2.3" diff --git a/Makefile b/Makefile index 4bab46b8..a111920c 100644 --- a/Makefile +++ b/Makefile @@ -24,16 +24,6 @@ down: ## -- CI Test Methods -- -## Start up PHP 7.1 -.PHONY: up-71 -up-71: - docker-compose -f docker-compose.yml -f docker/71.yml up -d - -## Start up PHP 7.2 -.PHONY: up-72 -up-72: - docker-compose -f docker-compose.yml -f docker/72.yml up -d - ## Start up PHP 7.3 .PHONY: up-73 up-73: diff --git a/docker/71.yml b/docker/71.yml deleted file mode 100644 index 17340c92..00000000 --- a/docker/71.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.0" -services: - web: - build: - context: "." - args: - BASE_IMAGE: idealpostcodes/magento-test:m2.2-php7.1 diff --git a/docker/72.yml b/docker/72.yml deleted file mode 100644 index 8fefcada..00000000 --- a/docker/72.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.0" -services: - web: - build: - context: "." - args: - BASE_IMAGE: idealpostcodes/magento-test:m2.3-php7.2