[irods/irods_resource_plugin_s3#2156] bump clang to 13.0.1

korydraughn · Mar 6, 2024 · 03da95c · 03da95c
1 parent b6cfc53
commit 03da95c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/build-irods-centos.yml b/.github/workflows/build-irods-centos.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Prerequisites
         run:  |
               yum -y update ca-certificates
-              yum -y install bind-utils wget epel-release
+              yum -y install bind-utils wget epel-release centos-release-scl
               yum -y install gcc g++ libstdc++-static make rpm-build bzip2-devel curl-devel fakeroot openssl-devel pam-devel python-devel unixODBC unixODBC-devel zlib-devel python36-distro
       - name: Install iRODS Externals
         run:  |
@@ -25,8 +25,8 @@ jobs:
                 irods-externals-avro1.11.0-2 \
                 irods-externals-boost1.81.0-0 \
                 irods-externals-catch22.13.8-0 \
-                irods-externals-clang-runtime13.0.0-0 \
-                irods-externals-clang13.0.0-0 \
+                irods-externals-clang-runtime13.0.1-0 \
+                irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
                 irods-externals-fmt8.1.1-0 \

diff --git a/.github/workflows/build-irods-debian.yml b/.github/workflows/build-irods-debian.yml
@@ -24,8 +24,8 @@ jobs:
                 irods-externals-avro1.11.0-2 \
                 irods-externals-boost1.81.0-0 \
                 irods-externals-catch22.13.8-0 \
-                irods-externals-clang-runtime13.0.0-0 \
-                irods-externals-clang13.0.0-0 \
+                irods-externals-clang-runtime13.0.1-0 \
+                irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
                 irods-externals-fmt8.1.1-0 \

diff --git a/.github/workflows/build-irods-enterprise-linux-8.yml b/.github/workflows/build-irods-enterprise-linux-8.yml
@@ -15,6 +15,8 @@ jobs:
         run:  |
               dnf -y update ca-certificates
               dnf -y install bind-utils wget git epel-release
+              dnf -y install dnf-plugin-config-manager dnf-plugins-core
+              dnf config-manager --set-enabled powertools
               dnf -y install gcc gcc-c++ make rpm-build bzip2-devel curl-devel fakeroot openssl-devel pam-devel python36-devel unixODBC unixODBC-devel zlib-devel python3-distro
       - name: Install iRODS Externals
         run:  |
@@ -26,8 +28,8 @@ jobs:
                 irods-externals-avro1.11.0-2 \
                 irods-externals-boost1.81.0-0 \
                 irods-externals-catch22.13.8-0 \
-                irods-externals-clang-runtime13.0.0-0 \
-                irods-externals-clang13.0.0-0 \
+                irods-externals-clang-runtime13.0.1-0 \
+                irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
                 irods-externals-fmt8.1.1-0 \

diff --git a/.github/workflows/build-irods-enterprise-linux-9.yml b/.github/workflows/build-irods-enterprise-linux-9.yml
@@ -29,8 +29,8 @@ jobs:
                 irods-externals-avro1.11.0-2 \
                 irods-externals-boost1.81.0-0 \
                 irods-externals-catch22.13.8-0 \
-                irods-externals-clang-runtime13.0.0-0 \
-                irods-externals-clang13.0.0-0 \
+                irods-externals-clang-runtime13.0.1-0 \
+                irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
                 irods-externals-fmt8.1.1-0 \

diff --git a/.github/workflows/build-irods-ubuntu.yml b/.github/workflows/build-irods-ubuntu.yml
@@ -31,8 +31,8 @@ jobs:
                 irods-externals-avro1.11.0-2 \
                 irods-externals-boost1.81.0-0 \
                 irods-externals-catch22.13.8-0 \
-                irods-externals-clang-runtime13.0.0-0 \
-                irods-externals-clang13.0.0-0 \
+                irods-externals-clang-runtime13.0.1-0 \
+                irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
                 irods-externals-fmt8.1.1-0 \

diff --git a/.github/workflows/linter-irods-clang-format.yml b/.github/workflows/linter-irods-clang-format.yml
@@ -23,11 +23,11 @@ jobs:
                   wget -qO - https://unstable.irods.org/irods-unstable-signing-key.asc | sudo apt-key add -
                   echo "deb [arch=amd64] https://unstable.irods.org/apt/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/renci-irods-unstable.list
                   sudo apt-get update -qq
-                  sudo apt-get install -qq irods-externals-clang13.0.0-0
+                  sudo apt-get install -qq irods-externals-clang13.0.1-0
             - name: Run Clang-Format
               run: |
                   # Make clang-format available.
-                  export PATH=/opt/irods-externals/clang13.0.0-0/bin:$PATH
+                  export PATH=/opt/irods-externals/clang13.0.1-0/bin:$PATH
 
                   # Configure Git so that "git clang-format" can be run.
                   git config --global clangFormat.binary clang-format

diff --git a/.github/workflows/linter-irods-clang-tidy.yml b/.github/workflows/linter-irods-clang-tidy.yml
@@ -51,8 +51,8 @@ jobs:
                     irods-externals-avro1.11.0-2 \
                     irods-externals-boost1.81.0-0 \
                     irods-externals-catch22.13.8-0 \
-                    irods-externals-clang-runtime13.0.0-0 \
-                    irods-externals-clang13.0.0-0 \
+                    irods-externals-clang-runtime13.0.1-0 \
+                    irods-externals-clang13.0.1-0 \
                     irods-externals-cmake3.21.4-0 \
                     irods-externals-cppzmq4.8.1-1 \
                     irods-externals-fmt8.1.1-0 \
@@ -70,8 +70,8 @@ jobs:
             - name: Run Clang-Tidy
               run: |
                   # Make clang and clang-tidy available.
-                  export PATH=/opt/irods-externals/clang13.0.0-0/bin:$PATH
-                  export PATH=/opt/irods-externals/clang13.0.0-0/share/clang:$PATH
+                  export PATH=/opt/irods-externals/clang13.0.1-0/bin:$PATH
+                  export PATH=/opt/irods-externals/clang13.0.1-0/share/clang:$PATH
 
                   # Run clang-tidy on the changes.
                   git diff -U0 origin/$GITHUB_BASE_REF | \

diff --git a/cmake/Modules/IrodsCXXCompiler.cmake b/cmake/Modules/IrodsCXXCompiler.cmake
@@ -16,7 +16,7 @@ set(IRODS_BUILD_WITH_CLANG ON CACHE BOOL "Try to build with clang instead of gcc
 set(CLANG_STATIC_ANALYZER OFF CACHE BOOL "Choose whether to run Clang Static Analyzer.")
 
 if (IRODS_BUILD_WITH_CLANG)
-	IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH(CLANG clang13.0.0-0)
+	IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH(CLANG clang13.0.1-0)
 else()
 	set(CLANG_STATIC_ANALYZER OFF CACHE BOOL "Choose whether to run Clang Static Analyzer." FORCE)
 	message(STATUS "Setting CLANG_STATIC_ANALYZER to 'OFF'.")

diff --git a/cmake/Modules/UseLibCXX.cmake b/cmake/Modules/UseLibCXX.cmake
@@ -24,8 +24,8 @@ set(IRODS_BUILD_AGAINST_LIBCXX ${IRODS_BUILD_AGAINST_LIBCXX_DEFAULT} CACHE BOOL
 
 if (IRODS_BUILD_AGAINST_LIBCXX)
   include(IrodsExternals)
-  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH(CLANG clang13.0.0-0)
-  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(CLANG_RUNTIME clang-runtime13.0.0-0)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH(CLANG clang13.0.1-0)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(CLANG_RUNTIME clang-runtime13.0.1-0)
   unset(IRODS_PACKAGE_DEPENDENCIES_STRING)
   string(REPLACE ";" ", " IRODS_PACKAGE_DEPENDENCIES_STRING "${IRODS_PACKAGE_DEPENDENCIES_LIST}")