Skip to content

Commit 0761d0b

Browse files
committed
CI: Replace Mageia 7 with Mageia 8
Mageia 7 ended on 2021-06-30. Mageia 8 removed python2-six package <https://wiki.mageia.org/en/Mageia_8_Release_Notes#Python2_is_mostly_dead>.
1 parent 7c0158b commit 0761d0b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.ci/ci-mageia.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source $SCRIPT_DIR/ci-common.inc
88
set -e
99
set -x
1010

11-
release=${1:-7}
11+
release=${1:-8}
1212

1313
mmd_run_docker_tests \
1414
os=mageia \

.ci/mageia/Dockerfile.deps.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN dnf -y --setopt=install_weak_deps=False --setopt=tsflags='' install \
2424
openssl \
2525
pkgconf \
2626
popt-devel \
27-
python2-six \
27+
python3-six \
2828
python3-autopep8 \
2929
python3-devel \
3030
python3-gitpython \

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,12 @@ jobs:
281281
meson test -C ci_valgrind --suite ci_valgrind --print-errorlogs -t 10
282282
--wrap=$GITHUB_WORKSPACE/contrib/valgrind/valgrind_wrapper.sh
283283

284-
mageia_7:
285-
name: Mageia 7
284+
mageia_8:
285+
name: Mageia 8
286286
runs-on: ubuntu-latest
287287
continue-on-error: true
288288
container:
289-
image: docker.io/mageia:7
289+
image: docker.io/library/mageia:8
290290

291291
steps:
292292
- name: Install dependencies
@@ -313,7 +313,7 @@ jobs:
313313
openssl
314314
pkgconf
315315
popt-devel
316-
python2-six
316+
python3-six
317317
python3-autopep8
318318
python3-devel
319319
python3-gitpython

0 commit comments

Comments
 (0)