Skip to content

Commit

Permalink
ARROW-14927: [CI] Upgrade Fedora 33 to Fedora 35
Browse files Browse the repository at this point in the history
Seems to be ok. Get one warning when running `archery docker run fedora-cpp` :
```
CMake Warning at cmake_modules/Findre2Alt.cmake:25 (find_package):
  By not providing "Findre2.cmake" in CMAKE_MODULE_PATH this project has
  asked CMake to find a package configuration file provided by "re2", but
  CMake did not find one.

  Could not find a package configuration file provided by "re2" with any of
  the following names:

    re2Config.cmake
    re2-config.cmake

  Add the installation prefix of "re2" to CMAKE_PREFIX_PATH or set "re2_DIR"
  to a directory containing one of the above files.  If "re2" provides a
  separate development package or SDK, be sure it has been installed.
Call Stack (most recent call first):
  cmake_modules/ThirdpartyToolchain.cmake:244 (find_package)
  cmake_modules/ThirdpartyToolchain.cmake:2395 (resolve_dependency)
  CMakeLists.txt:548 (include)
```

Closes apache#12607 from bkmgit/ARROW-14927

Authored-by: bkmgit <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
bkmgit authored and kou committed Mar 12, 2022
1 parent d6b3e61 commit 0ed5fa1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ULIMIT_CORE=-1
# Default versions for platforms
ALMALINUX=8
DEBIAN=11
FEDORA=33
FEDORA=35
UBUNTU=20.04

# Default versions for various dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch
FROM ${arch}/fedora:33
FROM ${arch}/fedora:35
ARG arch

# install dependencies
Expand Down Expand Up @@ -54,6 +54,7 @@ RUN dnf update -y && \
openssl-devel \
protobuf-devel \
python \
python-devel \
python-pip \
rapidjson-devel \
re2-devel \
Expand Down
8 changes: 4 additions & 4 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1083,12 +1083,12 @@ tasks:
image: debian-cpp
{% endfor %}

test-fedora-33-cpp:
test-fedora-35-cpp:
ci: github
template: docker-tests/github.linux.yml
params:
env:
FEDORA: 33
FEDORA: 35
image: fedora-cpp

test-ubuntu-18.04-cpp-release:
Expand Down Expand Up @@ -1170,12 +1170,12 @@ tasks:
UBUNTU: 20.04
image: ubuntu-python

test-fedora-33-python-3:
test-fedora-35-python-3:
ci: azure
template: docker-tests/azure.linux.yml
params:
env:
FEDORA: 33
FEDORA: 35
image: fedora-python

test-r-linux-valgrind:
Expand Down

0 comments on commit 0ed5fa1

Please sign in to comment.