Skip to content

Commit

Permalink
Merge pull request #929 from eXist-db/fix-ci
Browse files Browse the repository at this point in the history
Fix ci
  • Loading branch information
joewiz authored Dec 19, 2023
2 parents 8f91679 + e88677d commit 523dc8f
Show file tree
Hide file tree
Showing 9 changed files with 799 additions and 576 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@ updates:
- dependency-name: acorn
versions:
- 8.0.5
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
14 changes: 5 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,17 @@ jobs:
strategy:
fail-fast: true
matrix:
jdk: ['8', '11']
jdk: ['8', '17']
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: temurin
cache: maven
java-version: ${{ matrix.jdk }}
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Maven Build
run: mvn clean package -DskipTests
- name: Test
Expand Down
20 changes: 20 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
projectId: 'h8zx19',
fileServerFolder: 'src/main/xar-resources',
fixturesFolder: 'src/test/cypress/fixtures',
screenshotsFolder: 'src/test/cypress/screenshots',
videosFolder: 'src/test/cypress/videos',
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./src/test/cypress/plugins/index.js')(on, config)
},
baseUrl: 'http://localhost:8080/exist/apps/doc/',
excludeSpecPattern: 'src/test/cypress/integration/examples/*.js',
specPattern: 'src/test/cypress/integration/**/*.{js,jsx,ts,tsx}',
supportFile: 'src/test/cypress/support/index.js',
},
})
12 changes: 0 additions & 12 deletions cypress.json

This file was deleted.

Loading

0 comments on commit 523dc8f

Please sign in to comment.