Skip to content

Commit a0c5127

Browse files
mcbartonvgvassilev
authored andcommitted
Update ci to remove warnings
1 parent 3f28495 commit a0c5127

File tree

1 file changed

+9
-71
lines changed

1 file changed

+9
-71
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -46,80 +46,19 @@ jobs:
4646
cling: On
4747
cling-version: '1.0'
4848
cppyy: On
49-
#Commented out until Ubuntu on arm Github runner becomes
50-
#available os key to be replaced once known
51-
#- name: ubu22-arm-gcc12-clang-repl-17
52-
# os: ubuntu-22.04-arm
53-
# compiler: gcc-12
54-
# clang-runtime: '17'
55-
# cling: Off
56-
# cppyy: Off
57-
#- name: ubu22-arm-gcc12-clang-repl-17-cppyy
58-
# os: ubuntu-22.04-arm
59-
# compiler: gcc-12
60-
# clang-runtime: '17'
61-
# cling: Off
62-
# cppyy: On
63-
#- name: ubu22-arm-gcc9-clang-repl-16
64-
# os: ubuntu-22.04-arm
65-
# compiler: gcc-9
66-
# clang-runtime: '16'
67-
# cling: Off
68-
# cppyy: Off
69-
#- name: ubu22-arm-gcc9-clang-repl-16-cppyy
70-
# os: ubuntu-22.04-arm
71-
# compiler: gcc-9
72-
# clang-runtime: '16'
73-
# cling: Off
74-
# cppyy: On
75-
#- name: ubu22-arm-gcc9-clang13-cling
76-
# os: ubuntu-22.04-arm
77-
# compiler: gcc-9
78-
# clang-runtime: '13'
79-
# cling: On
80-
# cling-version: '1.0'
81-
# cppyy: Off
82-
#- name: ubu22-arm-gcc9-clang13-cling-cppyy
83-
# os: ubuntu-22.04-arm
84-
# compiler: gcc-9
85-
# clang-runtime: '13'
86-
# cling: On
87-
# cling-version: '1.0'
88-
# cppyy: On
89-
# - name: win2022-msvc-clang-repl-17
90-
# os: windows-2022
91-
# compiler: msvc
92-
# clang-runtime: '17'
93-
# cling: Off
94-
# cppyy: Off
95-
#Commented out until rest of ci for Windows tested
49+
#Commented out until CppInterOp passes all tests on Windows
9650
#- name: win2022-msvc-clang-repl-17-cppyy
9751
# os: windows-2022
9852
# compiler: msvc
9953
# clang-runtime: '17'
10054
# cling: Off
10155
# cppyy: On
102-
# - name: win2022-msvc-clang-repl-16
103-
# os: windows-2022
104-
# compiler: msvc
105-
# clang-runtime: '16'
106-
# cling: Off
107-
# cppyy: Off
108-
#Commented out until rest of ci for Windows tested
10956
#- name: win2022-msvc-clang-repl-16-cppyy
11057
# os: windows-2022
11158
# compiler: msvc
11259
# clang-runtime: '16'
11360
# cling: Off
11461
# cppyy: On
115-
# - name: win2022-msvc-cling
116-
# os: windows-2022
117-
# compiler: msvc
118-
# clang-runtime: '13'
119-
# cling: On
120-
# cling-version: '1.0'
121-
# cppyy: Off
122-
#Commented out until rest of ci for Windows tested
12362
#- name: win2022-msvc-cling-cppyy
12463
# os: windows-2022
12564
# compiler: msvc
@@ -179,13 +118,13 @@ jobs:
179118
cppyy: On
180119

181120
steps:
182-
- uses: actions/checkout@v3
121+
- uses: actions/checkout@v4
183122
with:
184123
fetch-depth: 0
185124
- name: Set up Python
186-
uses: actions/setup-python@v4
125+
uses: actions/setup-python@v5
187126
with:
188-
python-version: '3.10'
127+
python-version: '3.11'
189128

190129
- name: Save PR Info on Unix systems
191130
if: ${{ runner.os != 'windows' }}
@@ -234,8 +173,6 @@ jobs:
234173
235174
echo "CLING_HASH=$env:CLING_HASH" >> $GITHUB_ENV
236175
echo "LLVM_HASH=$env:LLVM_HASH" >> $GITHUB_ENV
237-
238-
- uses: nelonoel/[email protected]
239176
240177
- name: Setup default Build Type on *nux
241178
if: runner.os != 'windows'
@@ -346,6 +283,7 @@ jobs:
346283
if: runner.os == 'macOS'
347284
run: |
348285
brew update
286+
brew remove [email protected]
349287
# workaround for https://github.com/actions/setup-python/issues/577
350288
for pkg in $(brew list | grep '^python@'); do
351289
brew unlink "$pkg"
@@ -357,7 +295,7 @@ jobs:
357295
pip install distro pytest
358296
359297
- name: Restore Cache LLVM/Clang runtime build directory
360-
uses: actions/cache/restore@v3
298+
uses: actions/cache/restore@v4
361299
id: cache
362300
with:
363301
path: |
@@ -438,7 +376,7 @@ jobs:
438376
cd ../
439377
mkdir ./cppyy/llvm-project/
440378
#FIXME: Avoid copy command by caching based on absolute path
441-
cp -r -v ./llvm-project/* ./cppyy/llvm-project/
379+
cp -r ./llvm-project/* ./cppyy/llvm-project/
442380
echo "Copy llvm-project folder to cppyy for caching"
443381
444382
- name: Build LLVM/Cling on Windows systems if the cache is invalid
@@ -516,11 +454,11 @@ jobs:
516454
rm -r -force $(find.exe . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")
517455
cd ..\
518456
mkdir .\cppyy\llvm-project\
519-
cp -r -v .\llvm-project\ .\cppyy\
457+
cp -r .\llvm-project\ .\cppyy\
520458
echo "Copy llvm-project folder to cppyy for caching"
521459
522460
- name: Save Cache LLVM/Clang runtime build directory
523-
uses: actions/cache/save@v3
461+
uses: actions/cache/save@v4
524462
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
525463
with:
526464
path: |

0 commit comments

Comments
 (0)