Skip to content

Commit fd7dd3c

Browse files
committed
Add Ubuntu 24.04 arm runners to ci
1 parent b898984 commit fd7dd3c

File tree

3 files changed

+89
-2
lines changed

3 files changed

+89
-2
lines changed

.github/workflows/Ubuntu.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,42 @@ jobs:
9494
cling-version: '1.0'
9595
llvm_enable_projects: "clang"
9696
llvm_targets_to_build: "host;NVPTX"
97+
- name: ubu24-arm-gcc12-clang-repl-19
98+
os: ubuntu-24.04-arm
99+
compiler: gcc-12
100+
clang-runtime: '19'
101+
cling: Off
102+
llvm_enable_projects: "clang"
103+
llvm_targets_to_build: "host;NVPTX"
104+
- name: ubu24-arm-gcc12-clang-repl-18
105+
os: ubuntu-24.04-arm
106+
compiler: gcc-12
107+
clang-runtime: '18'
108+
cling: Off
109+
llvm_enable_projects: "clang"
110+
llvm_targets_to_build: "host;NVPTX"
111+
- name: ubu24-arm-gcc12-clang-repl-17
112+
os: ubuntu-24.04-arm
113+
compiler: gcc-12
114+
clang-runtime: '17'
115+
cling: Off
116+
llvm_enable_projects: "clang"
117+
llvm_targets_to_build: "host;NVPTX"
118+
- name: ubu24-arm-gcc12-clang-repl-16
119+
os: ubuntu-24.04-arm
120+
compiler: gcc-12
121+
clang-runtime: '16'
122+
cling: Off
123+
llvm_enable_projects: "clang"
124+
llvm_targets_to_build: "host;NVPTX"
125+
- name: ubu24-arm-gcc9-clang13-cling
126+
os: ubuntu-24.04-arm
127+
compiler: gcc-9
128+
clang-runtime: '13'
129+
cling: On
130+
cling-version: '1.0'
131+
llvm_enable_projects: "clang"
132+
llvm_targets_to_build: "host;NVPTX"
97133

98134
steps:
99135
- uses: actions/checkout@v4
@@ -337,6 +373,33 @@ jobs:
337373
clang-runtime: '13'
338374
cling: On
339375
cling-version: '1.0'
376+
- name: ubu24-arm-gcc12-clang-repl-19
377+
os: ubuntu-24.04-arm
378+
compiler: gcc-12
379+
clang-runtime: '19'
380+
cling: Off
381+
- name: ubu24-arm-gcc12-clang-repl-18
382+
os: ubuntu-24.04-arm
383+
compiler: gcc-12
384+
clang-runtime: '18'
385+
cling: Off
386+
- name: ubu24-arm-gcc12-clang-repl-17
387+
os: ubuntu-24.04-arm
388+
compiler: gcc-12
389+
clang-runtime: '17'
390+
cling: Off
391+
- name: ubu24-arm-gcc12-clang-repl-16
392+
os: ubuntu-24.04-arm
393+
compiler: gcc-12
394+
clang-runtime: '16'
395+
cling: Off
396+
cppyy: Off
397+
- name: ubu24-arm-gcc9-clang13-cling
398+
os: ubuntu-24.04-arm
399+
compiler: gcc-9
400+
clang-runtime: '13'
401+
cling: On
402+
cling-version: '1.0'
340403

341404
steps:
342405
- uses: actions/checkout@v4

.github/workflows/emscripten.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ jobs:
3737
llvm_enable_projects: "clang;lld"
3838
llvm_targets_to_build: "WebAssembly"
3939
emsdk_ver: "3.1.45"
40+
- name: ubu24-arm-gcc12-clang-repl-19-emscripten
41+
os: ubuntu-24.04-arm
42+
compiler: gcc-12
43+
clang-runtime: '19'
44+
cling: Off
45+
llvm_enable_projects: "clang;lld"
46+
llvm_targets_to_build: "WebAssembly"
47+
emsdk_ver: "3.1.45"
4048
- name: osx15-arm-clang-clang-repl-19-emscripten
4149
os: macos-15
4250
compiler: clang

lib/Interpreter/CppInterOp.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,15 @@ namespace Cpp {
28282828
#define DEBUG_TYPE "exec"
28292829

28302830
std::array<char, 256> buffer;
2831-
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
2831+
struct file_deleter
2832+
{
2833+
void operator()(FILE* fp)
2834+
{
2835+
pclose(fp);
2836+
}
2837+
};
2838+
using file_pointer = std::unique_ptr<FILE, file_deleter>;
2839+
file_pointer pipe{popen(cmd, "r")};
28322840
LLVM_DEBUG(dbgs() << "Executing command '" << cmd << "'\n");
28332841

28342842
if (!pipe) {
@@ -3437,7 +3445,15 @@ namespace Cpp {
34373445
}
34383446

34393447
class StreamCaptureInfo {
3440-
std::unique_ptr<FILE, decltype(std::fclose)*> m_TempFile;
3448+
struct file_deleter
3449+
{
3450+
void operator()(FILE* fp)
3451+
{
3452+
pclose(fp);
3453+
}
3454+
};
3455+
using file_pointer = std::unique_ptr<FILE, file_deleter>;
3456+
file_pointer m_TempFile;
34413457
int m_FD = -1;
34423458
int m_DupFD = -1;
34433459

0 commit comments

Comments
 (0)