Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
- Use correct dockerfile
- remove redundant ci.yml for now
  • Loading branch information
reebalazs committed Jun 30, 2023
1 parent eda2a74 commit f991b04
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 38 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ jobs:
env:
BABEL_ENV: production
CYPRESS_RETRIES: 2
CURRENT_DIR: '${{ github.workspace }}'
SOLR_CONTEXT_FOLDER: '${{ github.workspace }}/acceptance/solr'
with:
parallel: false
browser: chrome
working-directory: acceptance
spec: cypress/tests/*.js
install: false
start: |
docker compose -f ci.yml --profile prod up
wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000'
# XXX XXX This should be working with prod!
# docker compose -f docker-compose.yml --profile prod up
# XXX XXX This currently works with dev.
docker compose -f docker-compose.yml --profile dev up
wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000 http://localhost:8983'

# Upload Cypress screenshots
- uses: actions/upload-artifact@v3
Expand Down
36 changes: 0 additions & 36 deletions acceptance/ci.yml

This file was deleted.

2 changes: 2 additions & 0 deletions acceptance/cypress/support/commands.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import '@plone/volto-testing/cypress/support/commands';

const PLONE_API_URL = `http://localhost:55001/plone`;

// --- AUTOLOGIN -------------------------------------------------------------
Cypress.Commands.add('autologin', (usr, pass) => {
let api_url, user, password;
Expand Down
2 changes: 2 additions & 0 deletions acceptance/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ services:
ADDON_NAME: '${ADDON_NAME}'
ADDON_PATH: '${ADDON_PATH}'
VOLTO_VERSION: ${VOLTO_VERSION:-16}
volumes:
- ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
environment:
RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone
RAZZLE_API_PATH: http://localhost:55001/plone
Expand Down

0 comments on commit f991b04

Please sign in to comment.