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.

Sign up for GitHub

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

pm2-less integration tests #314

Merged
merged 9 commits into from
Apr 26, 2024
Merged

pm2-less integration tests #314

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3acdd34
pm2-less integration tests
vmikhailenko Apr 25, 2024
b05f946
Merge branch 'main' into maven-exec-plugin
vmikhailenko Apr 25, 2024
ccd67c2
Clearer log
vmikhailenko Apr 25, 2024
3ba4ae7
Merge remote-tracking branch 'refs/remotes/origin/maven-exec-plugin' …
vmikhailenko Apr 25, 2024
8e05300
Cleanup
vmikhailenko Apr 25, 2024
d56acf3
Add <skip>
vmikhailenko Apr 25, 2024
dcf0d6e
Use installed Node.js
vmikhailenko Apr 25, 2024
b477b7e
Cleanup
vmikhailenko Apr 25, 2024
3359c8d
Try default for cds.node.executable
vmikhailenko Apr 25, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main
- postgres
pull_request:
branches:
branches:
- main
- postgres

Expand All @@ -27,4 +27,4 @@ jobs:
java-version: 17
distribution: 'temurin'
- name: Build with Maven
run: mvn -B clean install
run: mvn -ntp -B clean install
36 changes: 16 additions & 20 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,33 +95,29 @@
<workingDirectory>${sidecar.dir}</workingDirectory>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>start-sidecar</id>
<goals>
<goal>npx</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<arguments>pm2 -l sidecar.log --time start --name=sidecar npm -- run start</arguments>
<skip>${skipTests}</skip>
<workingDirectory>${sidecar.dir}</workingDirectory>
</configuration>
</execution>

<execution>
<id>stop-sidecar</id>
<id>start-sidecar</id>
<goals>
<goal>npx</goal>
<goal>exec</goal>
</goals>
<phase>post-integration-test</phase>
<configuration>
<arguments>pm2 delete sidecar</arguments>
<skip>${skipTests}</skip>
<workingDirectory>${sidecar.dir}</workingDirectory>
</configuration>
</execution>
</executions>
<configuration>
<executable>node</executable>
<workingDirectory>${sidecar.dir}</workingDirectory>
<async>true</async>
<useMavenLogger>true</useMavenLogger>
<commandlineArgs>node_modules/@sap/cds/bin/cds-serve.js</commandlineArgs>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
3 changes: 1 addition & 2 deletions mtx/sidecar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"@sap/hdi-deploy": "4.8.2"
},
"devDependencies": {
"sqlite3": "^5",
"pm2": "^5.3.0"
"sqlite3": "^5"
},
"engines": {
"node": "^18"
Expand Down