From cfc25a9d27030a5818a4285df768d02f0982e799 Mon Sep 17 00:00:00 2001 From: Juri Leino Date: Sat, 26 Jun 2021 12:35:11 +0200 Subject: [PATCH] fix(ci): also test windows builds with GHA - remove appveyor configuration - remove appveyor specific scripts - add OS matrix to github actions workflow "test" --- .github/workflows/test.yml | 11 +++++++---- appveyor.yml | 25 ------------------------- ci/setup.ps1 | 28 ---------------------------- ci/teardown.ps1 | 10 ---------- 4 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 ci/setup.ps1 delete mode 100644 ci/teardown.ps1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0635f30..1d10bfd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,21 +2,24 @@ name: test node-exist on: pull_request: - branches: [ master, develop ] + branches: + - master push: branches: - - develop + - master workflow_dispatch: jobs: build: - runs-on: ubuntu-latest strategy: matrix: + os: [ubuntu-latest, windows-latest] node-version: [10.x, 12.x, 14.x] docker-tag: [latest, release, 4.7.1] + + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -38,7 +41,7 @@ jobs: run: docker start exist-ci - name: Wait for existdb startup - run: sleep 30 + run: sleep 20 - name: npm test run: npm test \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c82fc29..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: 1.2.{build} - -environment: - NODE_VERSION: 12 - - matrix: - - EXIST_VERSION: 5.2.0 - - EXIST_VERSION: 4.7.1 - -install: - - ps: Install-Product node $env:NODE_VERSION - - cmd: npm install - - ps: ./ci/setup.ps1 - -test_script: - - cmd: npm test - -after_test: - - ps: ./ci/teardown.ps1 - -cache: - - C:\build - - node_modules - -build: off diff --git a/ci/setup.ps1 b/ci/setup.ps1 deleted file mode 100644 index 690d301..0000000 --- a/ci/setup.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -if (-Not (Test-Path C:\build\exist-eXist-$env:EXIST_VERSION -PathType Any)) { - Add-AppveyorMessage -Message \"Download and build eXist-db $env:EXIST_VERSION from https://github.com/eXist-db/exist/archive/eXist-$env:EXIST_VERSION.zip\" - - appveyor DownloadFile https://github.com/eXist-db/exist/archive/eXist-$env:EXIST_VERSION.zip - - 7z x -y eXist-$env:EXIST_VERSION.zip -oC:\build - - cd C:/build/exist-eXist-$env:EXIST_VERSION - - & ./build.bat - -} else { - Add-AppveyorMessage -Message \"Using cached eXist-db $env:EXIST_VERSION\" - - cd C:/build/exist-eXist-$env:EXIST_VERSION -} - -if ($env:EXIST_VERSION -eq "2.2") { - & ./tools/wrapper/bin/install.bat - & ./tools/wrapper/bin/wrapper-windows-x86-64.exe --start ..\conf\wrapper.conf -} else { - $env:EXIST_PROCESS = Start-Process -NoNewWindow .\bin\startup.bat -PassThru - sleep 30 -} - -cd $env:APPVEYOR_BUILD_FOLDER - -npm prune diff --git a/ci/teardown.ps1 b/ci/teardown.ps1 deleted file mode 100644 index 897ffc1..0000000 --- a/ci/teardown.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -cd C:/build/exist-eXist-$env:EXIST_VERSION - -if ($env:EXIST_VERSION -eq "2.2") { - & ./tools/wrapper/bin/wrapper-windows-x86-64.exe --stop ..\conf\wrapper.conf -} else { - Stop-Process $env:EXIST_PROCESS -} -& ./build.bat clean-default-data-dir -Remove-Item -Recurse -Force webapp/WEB-INF/logs/* -Remove-Item -Recurse -Force tools/jetty/logs/*