Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[irods/irods#7823] Migrate workflows to Ubuntu 24.04 #10

Merged
merged 1 commit into from
Dec 16, 2024
Merged

[irods/irods#7823] Migrate workflows to Ubuntu 24.04 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/linter-irods-clang-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ defaults:

jobs:
clang-format:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand All @@ -20,22 +20,22 @@ jobs:
run: |
sudo apt-get update -qq
sudo apt-get install -qq apt-transport-https ca-certificates
sudo apt-get install -qq wget
sudo apt-get install -qq wget lsb-release gnupg2 python3
- name: Install Clang Compiler
run: |
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
git config --global clangFormat.style file
git config --global clangFormat.extensions 'h,c,hpp,cpp'
git config --global clangFormat.extensions 'h,h.in,c,c.in,hpp,hpp.in,cpp,cpp.in'

# Diff the target branch with all changes made within the pull request.
diff_output=$(git clang-format --diff origin/$GITHUB_BASE_REF)
Expand Down
49 changes: 27 additions & 22 deletions .github/workflows/linter-irods-clang-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defaults:

jobs:
clang-tidy:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand All @@ -31,7 +31,8 @@ jobs:
curl \
g++ \
make \
python-dev \
cmake \
python3-dev \
unixodbc \
libcurl4-gnutls-dev \
libbz2-dev \
Expand All @@ -40,53 +41,57 @@ jobs:
libssl-dev \
libxml2-dev \
unixodbc-dev \
python-psutil \
python3-psutil \
super \
odbc-postgresql \
libkrb5-dev \
python3-distro
- name: Install libstdc++6
run: |
sudo apt-get install -qq software-properties-common
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update -qq
sudo apt-get install -qq libstdc++6
python3-distro \
lsb-release \
gnupg2
- name: Install iRODS Externals
run: |
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-avro1.11.0-2 \
irods-externals-boost1.81.0-0 \
irods-externals-avro1.11.0-3 \
irods-externals-avro-libcxx1.11.0-3 \
irods-externals-boost1.81.0-1 \
irods-externals-boost-libcxx1.81.0-1 \
irods-externals-catch22.13.8-0 \
irods-externals-clang-runtime13.0.0-0 \
irods-externals-clang13.0.0-0 \
irods-externals-cmake3.21.4-0 \
irods-externals-clang13.0.1-0 \
irods-externals-clang-runtime13.0.1-0 \
irods-externals-cppzmq4.8.1-1 \
irods-externals-fmt8.1.1-0 \
irods-externals-fmt8.1.1-1 \
irods-externals-fmt-libcxx8.1.1-1 \
irods-externals-json3.10.4-0 \
irods-externals-jsoncons0.178.0-0 \
irods-externals-jwt-cpp0.6.99.1-0 \
irods-externals-libarchive3.5.2-0 \
irods-externals-nanodbc2.13.0-1 \
irods-externals-spdlog1.9.2-1 \
irods-externals-zeromq4-14.1.8-0
irods-externals-nanodbc2.13.0-2 \
irods-externals-nanodbc-libcxx2.13.0-2 \
irods-externals-qpid-proton0.36.0-2 \
irods-externals-qpid-proton-libcxx0.36.0-2 \
irods-externals-redis4.0.10-0 \
irods-externals-spdlog1.9.2-2 \
irods-externals-spdlog-libcxx1.9.2-2 \
irods-externals-zeromq4-14.1.8-1 \
irods-externals-zeromq4-1-libcxx4.1.8-1
- name: Install iRODS Development Package
if: ${{ inputs.install_irods_development_package }}
run: |
sudo apt-get update -qq
sudo apt-get install -y irods-dev
- name: Configure CMake
run: |
export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH
mkdir build
cd build
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
- 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 | \
Expand Down