Skip to content

Commit

Permalink
Merge branch 'master' into with_tests
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/csharp-build.yml
#	.github/workflows/csharp-simple-build.yml
#	.github/workflows/java-build.yml
#	.github/workflows/java-simple-build.yml
#	.github/workflows/javascript-build.yml
#	.github/workflows/python-build.yml
#	.github/workflows/typescript-build.yml
#	java-simple/src/test/java/dojo/liftpasspricing/PricesTest.java
#	java/src/test/java/dojo/liftpasspricing/PricesTest.java
#	javascript/test/prices.test.js
#	python/test/test_prices.py
#	typescript/test/prices.spec.ts
  • Loading branch information
codecop committed Jun 8, 2024
2 parents 7e613c2 + b7d80b9 commit 089369c
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 21 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/csharp-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ name: csharp-build
# Controls when the action will run.
on:
push:
branches:
- with_tests
paths:
- 'csharp/**'
- '**/csharp-build.yml'
pull_request:
branches:
- with_tests
paths:
- 'csharp/**'
- '**/csharp-build.yml'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/csharp-simple-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ name: csharp-simple-build
# Controls when the action will run.
on:
push:
branches:
- with_tests
paths:
- 'csharp-simple/**'
- '**/csharp-simple-build.yml'
pull_request:
branches:
- with_tests
paths:
- 'csharp-simple/**'
- '**/csharp-simple-build.yml'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/java-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ env:
# Controls when the action will run.
on:
push:
branches:
- with_tests
paths:
- 'java/**'
- '**/java-build.yml'

pull_request:
branches:
- with_tests
paths:
- 'java/**'
- '**/java-build.yml'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/java-simple-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ env:
# Controls when the action will run.
on:
push:
branches:
- with_tests
paths:
- 'java-simple/**'
- '**/java-simple-build.yml'

pull_request:
branches:
- with_tests
paths:
- 'java-simple/**'
- '**/java-simple-build.yml'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/javascript-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,3 @@ jobs:

- name: Test
run: npm test

1 change: 0 additions & 1 deletion .github/workflows/python-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ jobs:

- name: Test
run: PYTHONPATH=src python -m pytest

7 changes: 4 additions & 3 deletions .github/workflows/typescript-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- name: Set up dependencies
run: npm install

- name: Test
run: npm test

- name: Build and test
run: |
npm run compile
npm test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
.DS_Store
.project

0 comments on commit 089369c

Please sign in to comment.