mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Fix for docker workflow (#3989)
* Update docker workflow * typo fix * Run tests differently in docker * Settings tweak * revert settings change * Don't build docker image on PR
This commit is contained in:
parent
8cd782dc8f
commit
ff400106d7
4
.github/workflows/docker.yaml
vendored
4
.github/workflows/docker.yaml
vendored
@ -49,12 +49,14 @@ jobs:
|
|||||||
# Build the development docker image (using docker-compose.yml)
|
# Build the development docker image (using docker-compose.yml)
|
||||||
run: |
|
run: |
|
||||||
docker-compose build
|
docker-compose build
|
||||||
- name: Run Unit Tests
|
- name: Update Docker Image
|
||||||
run: |
|
run: |
|
||||||
docker-compose run inventree-dev-server invoke update
|
docker-compose run inventree-dev-server invoke update
|
||||||
docker-compose run inventree-dev-server invoke setup-dev
|
docker-compose run inventree-dev-server invoke setup-dev
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
docker-compose run inventree-dev-server invoke wait
|
docker-compose run inventree-dev-server invoke wait
|
||||||
|
- name: Run Unit Tests
|
||||||
|
run: |
|
||||||
docker-compose run inventree-dev-server invoke test
|
docker-compose run inventree-dev-server invoke test
|
||||||
docker-compose down
|
docker-compose down
|
||||||
- name: Check Data Directory
|
- name: Check Data Directory
|
||||||
|
@ -777,13 +777,14 @@ class TestSettings(helpers.InvenTreeTestCase):
|
|||||||
"""Test if install of plugins on startup works."""
|
"""Test if install of plugins on startup works."""
|
||||||
from plugin import registry
|
from plugin import registry
|
||||||
|
|
||||||
# Check an install run
|
if not settings.DOCKER:
|
||||||
response = registry.install_plugin_file()
|
# Check an install run
|
||||||
self.assertEqual(response, 'first_run')
|
response = registry.install_plugin_file()
|
||||||
|
self.assertEqual(response, 'first_run')
|
||||||
|
|
||||||
# Set dynamic setting to True and rerun to launch install
|
# Set dynamic setting to True and rerun to launch install
|
||||||
InvenTreeSetting.set_setting('PLUGIN_ON_STARTUP', True, self.user)
|
InvenTreeSetting.set_setting('PLUGIN_ON_STARTUP', True, self.user)
|
||||||
registry.reload_plugins(full_reload=True)
|
registry.reload_plugins(full_reload=True)
|
||||||
|
|
||||||
# Check that there was anotehr run
|
# Check that there was anotehr run
|
||||||
response = registry.install_plugin_file()
|
response = registry.install_plugin_file()
|
||||||
|
Loading…
Reference in New Issue
Block a user