Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit c51c180

Browse files
CI: get rid of Fedora 32 (EOL) and add 35, which replaces 34 in gha.yml
1 parent 983ef6b commit c51c180

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/gha.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
WORKDIR: utils/docker
3030
strategy:
3131
matrix:
32-
CONFIG: ["TYPE=debug OS=fedora OS_VER=34 PUSH_IMAGE=1",
32+
CONFIG: ["TYPE=debug OS=fedora OS_VER=35 PUSH_IMAGE=1",
3333
"TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1",
3434
"TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1",
35-
"TYPE=release OS=fedora OS_VER=34",
35+
"TYPE=release OS=fedora OS_VER=35",
3636
"TYPE=release OS=ubuntu OS_VER=20.04",
3737
"TYPE=valgrind OS=ubuntu OS_VER=20.04",
3838
"TYPE=memcheck_drd OS=ubuntu OS_VER=20.04",
39-
"TYPE=package OS=fedora OS_VER=34",
39+
"TYPE=package OS=fedora OS_VER=35",
4040
"TYPE=package OS=ubuntu OS_VER=20.04"]
4141
steps:
4242
- name: Get release version
@@ -88,7 +88,7 @@ jobs:
8888
github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/stable-')
8989
strategy:
9090
matrix:
91-
CONFIG: ["TYPE=doc OS=fedora OS_VER=34"]
91+
CONFIG: ["TYPE=doc OS=fedora OS_VER=35"]
9292
steps:
9393
- name: Set image version for stable branch
9494
# doc update happens only on stable branch (not on PR), so we check only for heads ref

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
"OS=debian OS_VER=testing",
3535
"OS=debian OS_VER=unstable",
3636
"OS=debian OS_VER=latest",
37-
"OS=fedora OS_VER=32",
3837
"OS=fedora OS_VER=33",
38+
"OS=fedora OS_VER=34",
3939
"OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
4040
"OS=opensuse-leap OS_VER=latest",
4141
"OS=opensuse-tumbleweed OS_VER=latest",

utils/docker/images/Dockerfile.fedora-34

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - a 'recipe' for Docker to build an image of fedora-based
@@ -71,7 +71,6 @@ ARG TESTS_DEPS="\
7171
# Misc for our builds/CI (optional)
7272
ARG MISC_DEPS="\
7373
clang \
74-
hub \
7574
perl-Text-Diff \
7675
pkgconf \
7776
sudo"
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - a 'recipe' for Docker to build an image of fedora-based
66
# environment prepared for running libpmemobj-cpp tests.
77
#
88

99
# Pull base image
10-
FROM registry.fedoraproject.org/fedora:32
10+
FROM registry.fedoraproject.org/fedora:35
1111
1212

1313
# Set required environment variables
1414
ENV OS fedora
15-
ENV OS_VER 32
15+
ENV OS_VER 35
1616
ENV PACKAGE_MANAGER rpm
1717
ENV NOTTY 1
1818

@@ -71,6 +71,7 @@ ARG TESTS_DEPS="\
7171
# Misc for our builds/CI (optional)
7272
ARG MISC_DEPS="\
7373
clang \
74+
hub \
7475
perl-Text-Diff \
7576
pkgconf \
7677
sudo"

0 commit comments

Comments
 (0)