diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..7ae662e8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: CI +on: [push, pull_request] +jobs: + build: + name: Build and Test (${{ matrix.os }} / OpenJDK ${{ matrix.jdk }}) + strategy: + fail-fast: true + matrix: + jdk: ['8', '11'] + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.jdk }} + uses: actions/setup-java@v1 + with: + 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 + env: + CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} + run: mvn verify diff --git a/.gitignore b/.gitignore index 3e8b85ef..ce3d920d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,7 @@ node/* maven-archiver/ +.DS_Store + src/test/cypress/videos/*.mp4 src/test/cypress/screenshots/**/*.png diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0c3bd1d6..00000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -language: java - -dist: bionic -addons: - apt: - packages: - - libgconf-2-4 -jdk: - - openjdk8 - - openjdk11 - -services: - - docker - -env: - - img=existdb/existdb:latest - # No need to check for backwards compatibility - # - img=existdb/existdb:release - -cache: - directories: - - $HOME/.m2 - -before_install: - - docker pull $img - - docker create --name exist-ci -p 8080:8080 $img - -install: - - mvn clean package -DskipTests -q - -before_script: - - docker cp ./target/*.xar exist-ci:exist/autodeploy/111.xar - - docker start exist-ci - # exist needs time - - sleep 30 - -script: - - mvn validate - - mvn test - - npm run cypress -- --record - -after_success: - - docker ps - -notifications: - slack: exist-db:IXzUdqA0n11cnxaDz43ZQgdX diff --git a/README.md b/README.md index 33e3f1ea..7bafcd0e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # eXist-db Documentation -[![Build Status](https://travis-ci.com/eXist-db/documentation.svg?branch=master)](https://travis-ci.com/eXist-db/documentation) +[![Build Status](https://github.com/eXist-db/documentation/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/eXist-db/documentation/actions/workflows/ci.yml) [![Docbook version](https://img.shields.io/badge/docbook-5.1-19a5a4.svg)](http://docbook.org/xml/5.1/) [![eXist-db version](https://img.shields.io/badge/eXist_db-5.2.0-blue.svg)](http://www.exist-db.org/exist/apps/homepage/index.html) diff --git a/cypress.json b/cypress.json index 3eedf4a5..b3ee9747 100644 --- a/cypress.json +++ b/cypress.json @@ -9,5 +9,5 @@ "screenshotsFolder": "src/test/cypress/screenshots", "supportFile": "src/test/cypress/support/index.js", "videosFolder": "src/test/cypress/videos", - "projectId": "h8zx19" + "projectId": "wgr8uu" } diff --git a/pom.xml b/pom.xml index 7734f222..0660b274 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,16 @@ + + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + + com.github.eirslett @@ -139,12 +149,13 @@ compile + mocha tests npm - test + integration-test test @@ -238,6 +249,46 @@ + + + io.fabric8 + docker-maven-plugin + 0.35.0 + + true + + + existdb-docs-tests + existdb/existdb:latest + + + 8080:8080 + + + Server has started, listening on + + + + + + + + + docker-it-start + pre-integration-test + + start + + + + docker-it-stop + post-integration-test + + stop + + + + org.apache.maven.plugins maven-gpg-plugin @@ -259,12 +310,81 @@ - - - exist - https://raw.github.com/eXist-db/mvn-repo/master/ - - + + + + cypress-without-record + + + env.CI + !true + + + + + + org.codehaus.mojo + exec-maven-plugin + + + integration-test + + exec + + + npm + + run + cypress + -- + + + + + + + + + + cypress-with-record + + + env.CI + true + + + + + + org.codehaus.mojo + exec-maven-plugin + + + integration-test + + exec + + + npm + + run + cypress + -- + --record + + + + + + + + + @@ -272,4 +392,5 @@ http://clojars.org/repo + diff --git a/src/test/mocha/test.js b/src/test/mocha/test.js deleted file mode 100644 index bd2870e0..00000000 --- a/src/test/mocha/test.js +++ /dev/null @@ -1,10 +0,0 @@ -const assert = require('assert') - -// this is a dummy test js tests are wip -describe('Mocha Self-test via Array', function () { - describe('#indexOf()', function () { - it('should return -1 when the value is not present', function () { - assert.strictEqual([1, 2, 3].indexOf(4), -1) - }) - }) -})