diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 2f86b61d4..bea7bc1fc 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -21,7 +21,7 @@ jobs: - '3.11' services: postgres: - image: 'postgres:13-alpine' + image: 'postgres:14-alpine' ports: - 5432 env: @@ -31,7 +31,7 @@ jobs: options: --health-cmd pg_isready --health-interval 5s --health-timeout 1s --health-retries 10 mysql: - image: 'mysql:5.7' + image: 'mysql:8' ports: - 3306 env: @@ -42,10 +42,10 @@ jobs: # Do not log verbosely DSMRREADER_LOGLEVEL: ERROR steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -55,7 +55,7 @@ jobs: sudo apt-get install -y gettext libgettextpo-dev libmariadb-dev-compat libmariadb-dev - name: Cached dependencies & virtualenv - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cache/pypoetry/ @@ -107,7 +107,7 @@ jobs: DJANGO_DATABASE_PASSWORD: '' - name: Code coverage upload - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 # Shallow tests for (older) supported Python versions. @@ -127,10 +127,10 @@ jobs: # Do not log verbosely DSMRREADER_LOGLEVEL: ERROR steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -140,7 +140,7 @@ jobs: sudo apt-get install -y gettext libgettextpo-dev libmariadb-dev-compat libmariadb-dev - name: Cached dependencies & virtualenv - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cache/pypoetry/ diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b480b66bb..8a09de0a7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.gitignore b/.gitignore index 6e5f5a604..3eb476765 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,7 @@ /Pipfile.lock /manage_mule.py /docker-compose.yml +/docker-compose.override.yml +/compose.yml +/compose.override.yml /Dockerfile diff --git a/.idea/runConfigurations/Docker__Quick_test.xml b/.idea/runConfigurations/Docker__Test_MySQL.xml similarity index 85% rename from .idea/runConfigurations/Docker__Quick_test.xml rename to .idea/runConfigurations/Docker__Test_MySQL.xml index 4aa07ba0d..a38fc0f83 100644 --- a/.idea/runConfigurations/Docker__Quick_test.xml +++ b/.idea/runConfigurations/Docker__Test_MySQL.xml @@ -1,6 +1,6 @@ - -