Skip to content

Commit 990193f

Browse files
committed
test
1 parent a8b47dc commit 990193f

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed

.github/actions/install-nightly-ice/action.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,9 @@ runs:
1313
if: runner.os == 'Linux'
1414
shell: bash
1515
run: |
16+
wget https://download.zeroc.com/ice/nightly/ubuntu24.04/ice-repo-nightly_1.0_all.deb -O ice-repo-nightly.deb
17+
sudo dpkg -i ice-repo-nightly.deb
18+
rm ice-repo-nightly.deb
1619
17-
# Check for Red Hat based systems. We assume RHEL9 for now.
18-
if [ -f /etc/redhat-release ]; then
19-
dnf install https://download.zeroc.com/ice/nightly/el9/ice-repo-nightly-1.0.0-1.el9.noarch.rpm
20-
dnf install libice-c++-devel
21-
else
22-
wget https://download.zeroc.com/ice/nightly/ubuntu24.04/ice-repo-nightly_1.0_all.deb -O ice-repo-nightly.deb
23-
sudo dpkg -i ice-repo-nightly.deb
24-
rm ice-repo-nightly.deb
25-
26-
sudo apt-get update
27-
sudo apt-get install -y libzeroc-ice-dev
28-
fi
20+
sudo apt-get update
21+
sudo apt-get install -y libzeroc-ice-dev

.github/workflows/ci.yml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,11 @@ jobs:
165165
fail-fast: false
166166
matrix:
167167
include:
168-
- image: redhat/ubi9
168+
- name: amznlinux-2023
169+
image: public.ecr.aws/amazonlinux/amazonlinux:2023
170+
- name: el-10
171+
image: rockylinux/rockylinux:10
172+
169173
container:
170174
image: redhat/ubi9:latest
171175
volumes:
@@ -177,10 +181,29 @@ jobs:
177181
- name: Install Dependencies
178182
shell: bash
179183
run: |
180-
dnf install -y cmake ninja-build gcc-c++ wget
181-
182-
- name: Install Nightly Ice Builds
183-
uses: ./.github/actions/install-nightly-ice
184+
if [ -f /etc/os-release ]; then
185+
. /etc/os-release
186+
case "$ID" in
187+
amzn)
188+
yum install -y gcc gcc-c++ cmake make ninja-build wget
189+
dnf install https://download.zeroc.com/ice/nightly/amzn2023/ice-repo-nightly-1.0.0-1.amzn2023.noarch.rpm
190+
dnf install libice-c++-devel
191+
192+
;;
193+
rocky)
194+
dnf install -y gcc gcc-c++ cmake make ninja-build wget
195+
dnf install https://download.zeroc.com/ice/nightly/el10/ice-repo-nightly-1.0.0-1.el10.noarch.rpm
196+
dnf install libice-c++-devel
197+
;;
198+
*)
199+
echo "Unsupported OS: $ID"
200+
exit 1
201+
;;
202+
esac
203+
else
204+
echo "OS release information not found."
205+
exit 1
206+
fi
184207
185208
- name: Build C++ Demos
186209
timeout-minutes: 20

0 commit comments

Comments
 (0)