Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Properly split with multi-collabora matrix #3890

Merged
merged 3 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/cypress-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ jobs:
npm ci
npm run dev

- name: Register index for cypress-split
env:
container: "${{ matrix.containers }}"
run: |
echo "container_index: $(($container - 1))"
echo "container_index=$(($container - 1))" >> $GITHUB_ENV

- name: Cypress run
uses: cypress-io/github-action@v6
with:
Expand All @@ -162,8 +169,8 @@ jobs:
COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
COMMIT_INFO_SHA: ${{ github.event.pull_request.head.sha }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
SPLIT: ${{ strategy.job-total }}
SPLIT_INDEX: ${{ strategy.job-index }}
SPLIT: 3
SPLIT_INDEX: ${{ env.container_index }}

- name: Upload test failure screenshots
uses: actions/upload-artifact@v2
Expand Down
9 changes: 5 additions & 4 deletions cypress/e2e/integration.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ describe('Nextcloud integration', function() {
it('Save as', function() {
cy.get('@loleafletframe').within(() => {
cy.get('#File-tab-label').click()
cy.get('#saveas').click()
cy.get('#saveas-entries #saveas-entry-1').click()
cy.get('#file-saveas').click()
// FIXME: Seems currently broken, so let's skip this step
// cy.get('#saveas-entries #saveas-entry-1').click()
})

cy.get('.saveas-dialog').should('be.visible')
cy.get('.saveas-dialog input[type=text]')
.should('be.visible')
.should('have.value', '/document.rtf')
.should('have.value', '/document.odt')

cy.get('.saveas-dialog button.button-vue--vue-primary').click()

Expand All @@ -84,7 +85,7 @@ describe('Nextcloud integration', function() {
// FIXME: We should not need to reload
cy.get('.breadcrumb__crumbs a').eq(0).click({ force: true })

cy.openFile('document.rtf')
cy.openFile('document.odt')
})

it('Open locally', function() {
Expand Down
Loading