Skip to content

Commit 523dc8f

Browse files
authored
Merge pull request #929 from eXist-db/fix-ci
Fix ci
2 parents 8f91679 + e88677d commit 523dc8f

File tree

9 files changed

+799
-576
lines changed

9 files changed

+799
-576
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ updates:
4646
- dependency-name: acorn
4747
versions:
4848
- 8.0.5
49+
- package-ecosystem: "github-actions"
50+
directory: "/"
51+
schedule:
52+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@ jobs:
66
strategy:
77
fail-fast: true
88
matrix:
9-
jdk: ['8', '11']
9+
jdk: ['8', '17']
1010
os: [ubuntu-latest]
1111
runs-on: ${{ matrix.os }}
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Set up JDK ${{ matrix.jdk }}
15-
uses: actions/setup-java@v1
15+
uses: actions/setup-java@v4
1616
with:
17+
distribution: temurin
18+
cache: maven
1719
java-version: ${{ matrix.jdk }}
18-
- name: Cache Maven packages
19-
uses: actions/cache@v2
20-
with:
21-
path: ~/.m2
22-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
23-
restore-keys: ${{ runner.os }}-m2
2420
- name: Maven Build
2521
run: mvn clean package -DskipTests
2622
- name: Test

cypress.config.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const { defineConfig } = require('cypress')
2+
3+
module.exports = defineConfig({
4+
projectId: 'h8zx19',
5+
fileServerFolder: 'src/main/xar-resources',
6+
fixturesFolder: 'src/test/cypress/fixtures',
7+
screenshotsFolder: 'src/test/cypress/screenshots',
8+
videosFolder: 'src/test/cypress/videos',
9+
e2e: {
10+
// We've imported your old cypress plugins here.
11+
// You may want to clean this up later by importing these.
12+
setupNodeEvents(on, config) {
13+
return require('./src/test/cypress/plugins/index.js')(on, config)
14+
},
15+
baseUrl: 'http://localhost:8080/exist/apps/doc/',
16+
excludeSpecPattern: 'src/test/cypress/integration/examples/*.js',
17+
specPattern: 'src/test/cypress/integration/**/*.{js,jsx,ts,tsx}',
18+
supportFile: 'src/test/cypress/support/index.js',
19+
},
20+
})

cypress.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)