Skip to content

Commit

Permalink
Merge branch 'fix/issue-149' into fix/issue-129-t1
Browse files Browse the repository at this point in the history
  • Loading branch information
Shmuma committed Dec 19, 2024
2 parents 0f4c3fd + 80c867f commit 3fb1303
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

cd-job:
name: Continuous Delivery
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:

- name: SCM Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
check-tag-version-job:

name: Check Tag Version
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: SCM Checkout
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

Version-Check:
name: Version
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: SCM Checkout
Expand All @@ -27,7 +27,7 @@ jobs:
Documentation:
name: Build Documentation
needs: [ Version-Check ]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: SCM Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
Lint:
name: Linting (Python-${{ matrix.python-version }})
needs: [ Version-Check ]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
Type-Check:
name: Type Checking (Python-${{ matrix.python-version }})
needs: [ Version-Check ]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -92,11 +92,7 @@ jobs:
Security:
name: Security Checks (Python-${{ matrix.python-version }})
needs: [ Version-Check ]
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11"]
runs-on: ubuntu-24.04

steps:
- name: SCM Checkout
Expand Down Expand Up @@ -142,6 +138,7 @@ jobs:
sudo rm -rf /usr/local/share/chromium
sudo rm -rf /usr/local/lib/node_modules
sudo rm -rf /opt/ghc
- name: Allow unprivileged user namespaces
run: |
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
Expand All @@ -152,7 +149,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Calculate Test Coverage
run: poetry run nox -s test:coverage
run: poetry run nox -s coverage
env:
TEST_DB_VERSION: ${{matrix.exasol-version}}
PYTEST_ADDOPTS: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:

documentation-job:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: SCM Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:

report:
name: Generate Status Report
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.ALTERNATIVE_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
Expand All @@ -30,9 +31,8 @@ jobs:
- name: Copy Artifacts into Root Folder
working-directory: ./artifacts
run: |
cp coverage-python3.9/.coverage ../
cp lint-python3.9/.lint.txt ../
cp security-python3.9/.security.json ../
cp .coverage/.coverage ../
cp .lint.txt/.lint.txt ../
- name: Generate Report
run: poetry run nox -s project:report -- -- --format json | tee metrics.json
Expand Down
4 changes: 4 additions & 0 deletions doc/changes/unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Changes

## Security Issues

* #146: Fixed vulnerabilities by updating dependencies

### Bug fixing

* #143: itde_manager.bring_itde_up() fails if the container is not connected to the network
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock

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

1 change: 1 addition & 0 deletions test/unit/test_itde_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def test_bring_itde_up(mock_spawn_env, secrets, env_info):
nameserver=(NAME_SERVER_ADDRESS,),
db_mem_size="4 GiB",
db_disk_size="10 GiB",
docker_db_image_version="8.18.1",
)

assert secrets.get(CKey.itde_container) == TEST_CONTAINER_NAME
Expand Down

0 comments on commit 3fb1303

Please sign in to comment.