fix docker baseimage and CI errors
Some checks failed
build package and container / build-container (pull_request) Failing after 16s
check code / check-docs (pull_request) Successful in 6s
build package and container / build-pypackage (pull_request) Successful in 28s
check code / scan-code-py311 (pull_request) Successful in 17s
check code / check-code-py39 (pull_request) Successful in 6m40s
check code / check-code-py38 (pull_request) Successful in 7m2s
check code / check-code-py311 (pull_request) Successful in 6m40s
check code / check-code-py310 (pull_request) Successful in 6m56s
create release / release-pypackage (pull_request) Successful in 26s

This commit is contained in:
Ivan Schaller 2024-02-01 14:48:05 +01:00
parent 9db6bb6f87
commit 9be6a07052
2 changed files with 26 additions and 13 deletions

View file

@ -8,11 +8,6 @@ on:
branches: [main, master] branches: [main, master]
jobs: jobs:
check-code-py311:
uses: actions/workflows/.gitea/workflows/check_python_hatch.yml@master
with:
run-tests: true
scan-code-py311: scan-code-py311:
uses: actions/workflows/.gitea/workflows/sonarqube_python.yml@master uses: actions/workflows/.gitea/workflows/sonarqube_python.yml@master
needs: [check-code] needs: [check-code]
@ -45,10 +40,10 @@ jobs:
run: pip install -U hatch run: pip install -U hatch
- name: test codestyle - name: test codestyle
run: hatch run lint:style run: hatch run +py=3.8 lint:style
- name: test typing - name: test typing
run: hatch run lint:typing run: hatch run +py=3.8 lint:typing
- name: run tests - name: run tests
run: hatch run default:test run: hatch run default:test
@ -63,10 +58,10 @@ jobs:
run: pip install -U hatch run: pip install -U hatch
- name: test codestyle - name: test codestyle
run: hatch run lint:style run: hatch run +py=3.9 lint:style
- name: test typing - name: test typing
run: hatch run lint:typing run: hatch run +py=3.9 lint:typing
- name: run tests - name: run tests
run: hatch run default:test run: hatch run default:test
@ -81,10 +76,28 @@ jobs:
run: pip install -U hatch run: pip install -U hatch
- name: test codestyle - name: test codestyle
run: hatch run lint:style run: hatch run +py=3.10 lint:style
- name: test typing - name: test typing
run: hatch run lint:typing run: hatch run +py=3.10 lint:typing
- name: run tests
run: hatch run default:test
check-code-py311:
runs-on: python311
steps:
- name: checkout code
uses: actions/checkout@v3
- name: install hatch
run: pip install -U hatch
- name: test codestyle
run: hatch run +py=3.11 lint:style
- name: test typing
run: hatch run +py=3.11 lint:typing
- name: run tests - name: run tests
run: hatch run default:test run: hatch run default:test

View file

@ -1,4 +1,4 @@
FROM git.44net.ch/44net-services/python311:11 AS builder FROM git.44net.ch/44net/python311:11 AS builder
COPY pyproject.toml README.md /build/ COPY pyproject.toml README.md /build/
COPY src /build/src COPY src /build/src
@ -8,7 +8,7 @@ RUN \
&& pip3 install hatch hatchling \ && pip3 install hatch hatchling \
&& python3 -m hatch build --clean && python3 -m hatch build --clean
FROM git.44net.ch/44net-services/debian-s6:11 FROM git.44net.ch/44net/debian-s6:11
LABEL maintainer="Ivan Schaller" \ LABEL maintainer="Ivan Schaller" \
description="A CLI manga downloader" description="A CLI manga downloader"