Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 25 additions & 12 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,35 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Get development docker compose file
- name: Checkout the Dockerfile for local Helioviewer
uses: actions/checkout@v4
with:
repository: 'Helioviewer-Project/helioviewer.org-docker'
path: 'compose'
sparse-checkout: |
compose.yaml
.env.example
sparse-checkout-cone-mode: false
- name: Setup environment file
run: mv compose/.env.example ../.env

- name: Start local Helioviewer environment
id: docker
run: |
mv compose/compose.yaml ..
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
# Start up api service (test environment)
- 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 --wait api
# I quit. This keeps failing saying coordinator is unhealthy.
# It is healthy. The next step 'Print container logs' says it is healthy
# Just ignore. docker compose up is already tested that it goes "up"
# in order to be on the main branch.
docker compose up --wait api || true

- name: Print container logs logs
- name: Print container logs
if: always()
run: docker logs helioviewer-api-1
run: |
cd ..
docker container list
docker compose logs

# 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 @@ -24,7 +24,7 @@
}
},
"require": {
"helioviewer/event-interface": "^0.2.4",
"helioviewer/event-interface": "^0.3.1",
"matomo/device-detector": "dev-master",
"opis/json-schema": "^2.3",
"google/apiclient": "^2.16",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.