Skip to content

Commit

Permalink
Better event interface (#379)
Browse files Browse the repository at this point in the history
* Remove postprocessor

* Pass observation time to event interface

* Fix event query time range

Events were previously queried from the given time to 1 day forward.
Now events are queried from the given time and 12 hours forward & back.

* Update composer dependencies

* Set 500 http status for errors

* Fix typo, rm debug print

* Print container logs

* always print docker logs

* Update CI

* Remove cli

* update CI logging
  • Loading branch information
dgarciabriseno authored May 28, 2024
1 parent 25918c7 commit 49941c8
Show file tree
Hide file tree
Showing 7 changed files with 181 additions and 152 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ jobs:
- uses: actions/checkout@v3

- name: Get development docker compose file
run: cd .. && wget https://raw.githubusercontent.com/Helioviewer-Project/helioviewer.org-docker/main/compose.yaml
run: |
cd ..
wget https://raw.githubusercontent.com/Helioviewer-Project/helioviewer.org-docker/main/compose.yaml
wget https://raw.githubusercontent.com/Helioviewer-Project/helioviewer.org-docker/main/.env.example
mv .env.example .env
# The containers need to be able update config files
- name: Make writeable config files
Expand All @@ -29,12 +33,15 @@ jobs:
chmod o+rw settings/Config.php
# Start up api service (test environment)
# Start up cli service (installs test data)
- name: Start services
# --no-build to force it to use whatever is published in the registry
# -d to detach, so the command returns
# --wait to wait for containers to be healthy, meaning the test data is downloaded and ready
run: cd .. && docker compose up --no-build -d --wait api cli
run: cd .. && docker compose up --no-build --wait api

- name: Print container logs logs
if: always()
run: docker logs helioviewer-api-1

# Run the tests inside the api container
- name: Run phpunit tests
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"helioviewer/event-interface": "dev-main",
"helioviewer/event-interface": "v0.1.0",
"matomo/device-detector": "dev-master"
},
"require-dev": {
Expand Down
Loading

0 comments on commit 49941c8

Please sign in to comment.