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

Commit d079387

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request #1244 from lukaszstolarczuk/fix-nigthly-build
CI: Fix nightly build
2 parents 7e59f08 + 1a39eb6 commit d079387

14 files changed

+136
-146
lines changed

‎.github/workflows/gha.yml‎

Lines changed: 9 additions & 9 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
@@ -109,8 +109,7 @@ jobs:
109109

110110
windows:
111111
name: Windows
112-
runs-on: windows-latest
113-
112+
runs-on: windows-2019
114113
env:
115114
platform: x64
116115
VCPKG_DEFAULT_TRIPLET: x64-windows
@@ -119,7 +118,6 @@ jobs:
119118
PMDK_VERSION: "1.9"
120119
CMAKE_TOOLCHAIN_FILE: "C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
121120
CMAKE_INSTALL_PREFIX: "C:\\install\\libpmemobj-cpp"
122-
MSBUILD: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin"
123121
strategy:
124122
matrix:
125123
BUILD_TYPE: [Debug, Release]
@@ -129,8 +127,10 @@ jobs:
129127
CXX_STANDARD: 17
130128

131129
steps:
132-
- name: Update PATH
133-
run: echo "${env:MSBUILD}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
130+
- name: Setup MSBuild.exe
131+
uses: microsoft/[email protected]
132+
with:
133+
msbuild-architecture: ${env:ARCH}
134134

135135
- name: Cache vcpkg packages
136136
uses: actions/cache@v1

‎.github/workflows/nightly.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
CONFIG: ["OS=centos OS_VER=8",
32-
"OS=almalinux OS_VER=8",
31+
CONFIG: ["OS=almalinux OS_VER=8",
3332
"OS=archlinux-base OS_VER=latest",
3433
"OS=debian OS_VER=testing",
3534
"OS=debian OS_VER=unstable",
3635
"OS=debian OS_VER=latest",
37-
"OS=fedora OS_VER=32",
3836
"OS=fedora OS_VER=33",
37+
"OS=fedora OS_VER=34",
3938
"OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
4039
"OS=opensuse-leap OS_VER=latest",
4140
"OS=opensuse-tumbleweed OS_VER=latest",
4241
"OS=ubuntu OS_VER=18.04",
4342
"OS=ubuntu OS_VER=21.04",
43+
"OS=ubuntu OS_VER=21.10",
4444
"OS=ubuntu OS_VER=devel"]
4545
steps:
4646
- name: Clone the git repo

‎utils/docker/images/Dockerfile.archlinux-base-latest‎

Lines changed: 2 additions & 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 archlinux-based
@@ -110,6 +110,6 @@ RUN useradd -m $USER \
110110
&& echo $USERPASS >> $PFILE \
111111
&& passwd $USER < $PFILE \
112112
&& rm -f $PFILE \
113-
&& sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
113+
&& sed -i 's/# %wheel/%wheel/g' /etc/sudoers \
114114
&& gpasswd wheel -a $USER
115115
USER $USER

‎utils/docker/images/Dockerfile.centos-8‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎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"

utils/docker/images/Dockerfile.fedora-32 renamed to utils/docker/images/Dockerfile.fedora-35

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
MAINTAINER [email protected]
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"

‎utils/docker/images/Dockerfile.opensuse-leap-latest‎

Lines changed: 2 additions & 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 opensuse-based
@@ -106,7 +106,7 @@ RUN useradd -m $USER \
106106
&& echo $USERPASS >> $PFILE \
107107
&& passwd $USER < $PFILE \
108108
&& rm -f $PFILE \
109-
&& sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
109+
&& sed -i 's/# %wheel/%wheel/g' /etc/sudoers \
110110
&& groupadd wheel \
111111
&& gpasswd wheel -a $USER
112112
USER $USER

‎utils/docker/images/Dockerfile.opensuse-tumbleweed-latest‎

Lines changed: 4 additions & 3 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 opensuse-based
@@ -25,7 +25,8 @@ ARG BASE_DEPS="\
2525
cmake \
2626
gcc \
2727
git \
28-
make"
28+
make \
29+
shadow"
2930

3031
# Dependencies for compiling libpmemobj-cpp project
3132
ARG LIBPMEMOBJ_CPP_DEPS="\
@@ -106,7 +107,7 @@ RUN useradd -m $USER \
106107
&& echo $USERPASS >> $PFILE \
107108
&& passwd $USER < $PFILE \
108109
&& rm -f $PFILE \
109-
&& sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
110+
&& sed -i 's/# %wheel/%wheel/g' /etc/sudoers \
110111
&& groupadd wheel \
111112
&& gpasswd wheel -a $USER
112113
USER $USER

‎utils/docker/images/Dockerfile.ubuntu-18.04‎

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 ubuntu-based
@@ -78,7 +78,6 @@ ARG TESTS_DEPS="\
7878
# Misc for our builds/CI (optional)
7979
ARG MISC_DEPS="\
8080
clang \
81-
clang-format-9 \
8281
libtext-diff-perl \
8382
pkg-config \
8483
sudo \

‎utils/docker/images/Dockerfile.ubuntu-21.04‎

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 ubuntu-based
@@ -67,7 +67,6 @@ ARG TESTS_DEPS="\
6767
# Misc for our builds/CI (optional)
6868
ARG MISC_DEPS="\
6969
clang \
70-
clang-format-9 \
7170
libtext-diff-perl \
7271
pkg-config \
7372
sudo \

0 commit comments

Comments
 (0)