simple seems to be better

This commit is contained in:
Matthias 2021-12-03 01:03:32 +01:00
parent 045932dfe1
commit e4a0b09796
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076

View File

@ -23,25 +23,9 @@ env:
INVENTREE_MEDIA_ROOT: ./media INVENTREE_MEDIA_ROOT: ./media
INVENTREE_STATIC_ROOT: ./static INVENTREE_STATIC_ROOT: ./static
INVENTREE_DB_USER: inventree
INVENTREE_DB_PASSWORD: password
jobs: jobs:
init:
name: set parameters
runs-on: ubuntu-latest
outputs:
user: ${{ steps.step1.outputs.user }}
password: ${{ steps.step1.outputs.password }}
steps:
- id: step1
run: |
echo "::set-output name=user::${{ env.INVENTREE_DB_USER }}"
echo "::set-output name=password::${{ env.INVENTREE_DB_PASSWORD }}"
check_version: check_version:
name: version number name: version number
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -55,7 +39,7 @@ jobs:
pep_style: pep_style:
name: PEP style (python) name: PEP style (python)
needs: ['init', 'check_version'] needs: check_version
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -220,8 +204,8 @@ jobs:
env: env:
INVENTREE_DB_ENGINE: django.db.backends.postgresql INVENTREE_DB_ENGINE: django.db.backends.postgresql
INVENTREE_DB_USER: ${{needs.job1.outputs.user }} INVENTREE_DB_USER: inventree
INVENTREE_DB_PASSWORD: ${{needs.job1.outputs.password }} INVENTREE_DB_PASSWORD: password
INVENTREE_DB_HOST: '127.0.0.1' INVENTREE_DB_HOST: '127.0.0.1'
INVENTREE_DB_PORT: 5432 INVENTREE_DB_PORT: 5432
INVENTREE_DEBUG: info INVENTREE_DEBUG: info
@ -231,8 +215,8 @@ jobs:
postgres: postgres:
image: postgres image: postgres
env: env:
POSTGRES_USER: ${{ env.INVENTREE_DB_USER }} POSTGRES_USER: inventree
POSTGRES_PASSWORD: ${{ env.INVENTREE_DB_PASSWORD }} POSTGRES_PASSWORD: password
ports: ports:
- 5432:5432 - 5432:5432
@ -275,7 +259,7 @@ jobs:
# Database backend configuration # Database backend configuration
INVENTREE_DB_ENGINE: django.db.backends.mysql INVENTREE_DB_ENGINE: django.db.backends.mysql
INVENTREE_DB_USER: root INVENTREE_DB_USER: root
INVENTREE_DB_PASSWORD: ${{needs.job1.outputs.password }} INVENTREE_DB_PASSWORD: password
INVENTREE_DB_HOST: '127.0.0.1' INVENTREE_DB_HOST: '127.0.0.1'
INVENTREE_DB_PORT: 3306 INVENTREE_DB_PORT: 3306
INVENTREE_DEBUG: info INVENTREE_DEBUG: info
@ -286,9 +270,9 @@ jobs:
env: env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: ${{ env.INVENTREE_DB_NAME }} MYSQL_DATABASE: ${{ env.INVENTREE_DB_NAME }}
MYSQL_USER: ${{ env.INVENTREE_DB_USER }} MYSQL_USER: inventree
MYSQL_PASSWORD: ${{ env.INVENTREE_DB_PASSWORD }} MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: ${{ env.INVENTREE_DB_PASSWORD }} MYSQL_ROOT_PASSWORD: password
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
ports: ports:
- 3306:3306 - 3306:3306