Skip to content

Commit

Permalink
Use PHP8.4-rc tag, copy oxideshop.log to tests/Output, don't output c…
Browse files Browse the repository at this point in the history
…ontainer logs
  • Loading branch information
joernott committed Aug 8, 2024
1 parent b1dd369 commit 18ac707
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
prepare_shop:
matrix: &matrix
php: '["8.4"]'
php: '["8.4-rc"]'
mysql: '["8.0.36"]'

install_shop:
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/php8.4_mysql8.0_only.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
prepare_shop:
matrix: &matrix
php: '["8.4"]'
php: '["8.4-rc"]'
mysql: '["8.0.36"]'

install_shop:
Expand Down
8 changes: 8 additions & 0 deletions run_test_script/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,14 @@ runs:
cp data/php/logs/error_log.txt source/${{ inputs.path }}/${TESTDIR}/Output/
cp data/mysql/mysql/slow_log* source/${{ inputs.path }}/${TESTDIR}/Output/
cp data/mysql/mysql/general_log* source/${{ inputs.path }}/${TESTDIR}/Output/
if [ -f source/source/log/oxideshop.log ]; then
mkdir -p source/${{ inputs.path }}/${TESTDIR}/Output/source/log
cp source/${{ inputs.path }}/${TESTDIR}/Output/ source/${{ inputs.path }}/${TESTDIR}/Output/source/log/
fi
if [ -f source/vendor/oxid-esales/oxideshop-ce/log/oxideshop.log ]; then
mkdir -p source/${{ inputs.path }}/${TESTDIR}/Output/source/vendor/oxid-esales/oxideshop-ce/log
cp source/vendor/oxid-esales/oxideshop-ce/log/oxideshop.log source/${{ inputs.path }}/${TESTDIR}/Output/source/vendor/oxid-esales/oxideshop-ce/log/
fi
docker compose logs --tail=all >source/${{ inputs.path }}/${TESTDIR}/Output/docker-compose.log
for c in $(docker ps -aq); do
echo -e "\033[0;35m### Logs for $c ###\033[0m"
Expand Down
11 changes: 0 additions & 11 deletions stop_shop/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@ inputs:
runs:
using: "composite"
steps:
- name: Output docker logs
if: always()
shell: bash
run: |
# stop_shop: Output docker logs if make up failed
docker compose logs --tail=all >>docker-compose.log
for c in $(docker ps -aq); do
echo -e "\033[0;35m### Logs for $c ###\033[0m"
docker logs -n 2000 $c >docker-$c.log
done
- name: Stop containers
if: always()
shell: bash
Expand Down

0 comments on commit 18ac707

Please sign in to comment.