Skip to content

Commit 1e3479e

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
revert last commit (github workflows)
1 parent 57e3b88 commit 1e3479e

File tree

4 files changed

+27
-56
lines changed

4 files changed

+27
-56
lines changed

‎.github/workflows/build-arch-emu.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: lscpu
5959

6060
- name: checkout repository
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v3
6262
# shell: bash
6363

6464
- name: install dependencies
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: restore ccache
9696
# setup the GitHub cache used to maintain the ccache from one job to the next
97-
uses: actions/cache/restore@v4
97+
uses: actions/cache/restore@v3
9898
with:
9999
# location of the ccache of the chroot in the root file system
100100
path: /home/runner/rootfs/alpine-latest-${{ matrix.arch }}/home/runner/.ccache
@@ -164,7 +164,7 @@ jobs:
164164
- name: save ccache
165165
# Save the cache after we are done (successfully) building
166166
# This helps to retain the ccache even if the subsequent steps are failing.
167-
uses: actions/cache/save@v4
167+
uses: actions/cache/save@v3
168168
with:
169169
path: /home/runner/rootfs/alpine-latest-${{ matrix.arch }}/home/runner/.ccache
170170
key: ${{ steps.ccache-prepare.outputs.key }}

‎.github/workflows/build.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: lscpu
9595

9696
- name: checkout repository
97-
uses: actions/checkout@v4
97+
uses: actions/checkout@v3
9898

9999
- name: install dependencies
100100
env:
@@ -115,7 +115,7 @@ jobs:
115115
116116
- name: restore ccache
117117
# setup the GitHub cache used to maintain the ccache from one job to the next
118-
uses: actions/cache/restore@v4
118+
uses: actions/cache/restore@v3
119119
with:
120120
path: ~/.ccache
121121
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -192,7 +192,7 @@ jobs:
192192
- name: save ccache
193193
# Save the cache after we are done (successfully) building
194194
# This helps to retain the ccache even if the subsequent steps are failing.
195-
uses: actions/cache/save@v4
195+
uses: actions/cache/save@v3
196196
with:
197197
path: ~/.ccache
198198
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -348,7 +348,7 @@ jobs:
348348
msystem: ${{ matrix.msystem }}
349349

350350
- name: checkout repository
351-
uses: actions/checkout@v4
351+
uses: actions/checkout@v3
352352

353353
- name: prepare ccache
354354
# create key with human readable timestamp
@@ -360,7 +360,7 @@ jobs:
360360
361361
- name: restore ccache
362362
# Setup the GitHub cache used to maintain the ccache from one job to the next
363-
uses: actions/cache/restore@v4
363+
uses: actions/cache/restore@v3
364364
with:
365365
path: ${{ steps.ccache-prepare.outputs.ccachedir }}
366366
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -425,7 +425,7 @@ jobs:
425425
- name: save ccache
426426
# Save the cache after we are done (successfully) building
427427
# This helps to retain the ccache even if the subsequent steps are failing.
428-
uses: actions/cache/save@v4
428+
uses: actions/cache/save@v3
429429
with:
430430
path: ${{ steps.ccache-prepare.outputs.ccachedir }}
431431
key: ${{ steps.ccache-prepare.outputs.key }}

‎.github/workflows/macos.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
sysctl machdep
3636
3737
- name: checkout repository
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v3
3939

4040
- name: install dependencies
4141
# Homebrew's Python conflicts with the Python that comes pre-installed
@@ -61,7 +61,7 @@ jobs:
6161
6262
- name: restore ccache
6363
# setup the GitHub cache used to maintain the ccache from one job to the next
64-
uses: actions/cache/restore@v4
64+
uses: actions/cache/restore@v3
6565
with:
6666
path: /Users/runner/Library/Caches/ccache
6767
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -192,7 +192,7 @@ jobs:
192192
- name: save ccache
193193
# Save the cache after we are done (successfully) building
194194
# This helps to retain the ccache even if the subsequent steps are failing.
195-
uses: actions/cache/save@v4
195+
uses: actions/cache/save@v3
196196
with:
197197
path: /Users/runner/Library/Caches/ccache
198198
key: ${{ steps.ccache-prepare.outputs.key }}

‎.github/workflows/root-cmakelists.yaml

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
run: lscpu
8181

8282
- name: checkout repository
83-
uses: actions/checkout@v4
83+
uses: actions/checkout@v3
8484

8585
- name: install dependencies
8686
env:
@@ -101,7 +101,7 @@ jobs:
101101
102102
- name: restore ccache
103103
# setup the GitHub cache used to maintain the ccache from one job to the next
104-
uses: actions/cache/restore@v4
104+
uses: actions/cache/restore@v3
105105
with:
106106
path: ~/.ccache
107107
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -135,22 +135,6 @@ jobs:
135135
ccache -s
136136
echo "/usr/lib/ccache" >> $GITHUB_PATH
137137
138-
- name: check auto-dependency resolution
139-
# no need to check this with all runners. One is enough.
140-
if: ${{ matrix.cc == 'gcc' && matrix.cuda == 'without' }}
141-
run: |
142-
mkdir -p ${GITHUB_WORKSPACE}/build-dep && cd ${GITHUB_WORKSPACE}/build-dep
143-
IFS=':' read -r -a libs <<< "${INSTALLED_LIBS}"
144-
for lib in "${libs[@]}"; do
145-
printf "::group:: \033[0;32m==>\033[0m Configuring to build only \033[0;32m${lib}\033[0m\n"
146-
cmake --fresh \
147-
-DCMAKE_BUILD_TYPE="Release" \
148-
-DBLA_VENDOR="OpenBLAS" \
149-
-DSUITESPARSE_ENABLE_PROJECTS="${lib,,}" \
150-
..
151-
echo "::endgroup::"
152-
done
153-
154138
- name: configure
155139
run: |
156140
mkdir -p ${GITHUB_WORKSPACE}/build && cd ${GITHUB_WORKSPACE}/build
@@ -190,7 +174,7 @@ jobs:
190174
- name: save ccache
191175
# Save the cache after we are done (successfully) building.
192176
# This helps to retain the ccache even if the subsequent steps are failing.
193-
uses: actions/cache/save@v4
177+
uses: actions/cache/save@v3
194178
with:
195179
path: ~/.ccache
196180
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -289,7 +273,7 @@ jobs:
289273
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
290274
runs-on: windows-latest
291275

292-
name: msvc (${{ matrix.cc }} ${{ matrix.openmp }} OpenMP ${{ matrix.cuda }} CUDA, ${{ matrix.link }})
276+
name: msvc (${{ matrix.openmp }} OpenMP ${{ matrix.cuda }} CUDA, ${{ matrix.link }})
293277

294278
defaults:
295279
run:
@@ -304,7 +288,6 @@ jobs:
304288
openmp: [with, without]
305289
cuda: [without]
306290
link: [both]
307-
cc: [cl]
308291
include:
309292
- openmp: without
310293
openmp-cmake-flags: "-DSUITESPARSE_USE_OPENMP=OFF"
@@ -314,7 +297,6 @@ jobs:
314297
-DSUITESPARSE_USE_CUDA=ON
315298
-DCMAKE_CUDA_COMPILER_LAUNCHER="ccache"
316299
link: both
317-
cc: cl
318300
- openmp: with
319301
cuda: with
320302
cuda-cmake-flags:
@@ -324,11 +306,6 @@ jobs:
324306
link-cmake-flags:
325307
-DBUILD_SHARED_LIBS=OFF
326308
-DBUILD_STATIC_LIBS=ON
327-
cc: cl
328-
- openmp: with
329-
cuda: without
330-
link: both
331-
cc: clang-cl
332309

333310
env:
334311
CHERE_INVOKING: 1
@@ -340,15 +317,15 @@ jobs:
340317
Get-CIMInstance -Class Win32_Processor | Select-Object -Property Name
341318
342319
- name: checkout repository
343-
uses: actions/checkout@v4
320+
uses: actions/checkout@v3
344321

345-
- uses: conda-incubator/setup-miniconda@v3
322+
- uses: conda-incubator/setup-miniconda@v2
346323
with:
347324
auto-update-conda: true
348325

349326
- name: cache conda packages
350327
id: conda-cache
351-
uses: actions/cache/restore@v4
328+
uses: actions/cache/restore@v3
352329
with:
353330
path: C:/Miniconda/envs/test
354331
key: conda:msvc
@@ -384,7 +361,7 @@ jobs:
384361
385362
msystem: UCRT64
386363

387-
- uses: Jimver/cuda-toolkit@v0.2.14
364+
- uses: Jimver/cuda-toolkit@v0.2.11
388365
name: install CUDA toolkit
389366
if: matrix.cuda == 'with'
390367
id: cuda-toolkit
@@ -424,18 +401,18 @@ jobs:
424401
shell: msys2 {0}
425402
run: |
426403
echo "ccachedir=$(cygpath -m $(${CCACHE} -k cache_dir))" >> $GITHUB_OUTPUT
427-
echo "key=ccache:msvc:root:${{ matrix.cc }}:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT
404+
echo "key=ccache:msvc:root:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT
428405
429406
- name: restore ccache
430407
# Setup the GitHub cache used to maintain the ccache from one job to the next
431-
uses: actions/cache/restore@v4
408+
uses: actions/cache/restore@v3
432409
with:
433410
path: ${{ steps.ccache-prepare.outputs.ccachedir }}
434411
key: ${{ steps.ccache-prepare.outputs.key }}
435412
# Prefer caches from the same branch. Fall back to caches from the dev branch.
436413
restore-keys: |
437-
ccache:msvc:root:${{ matrix.cc }}:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:${{ github.ref }}
438-
ccache:msvc:root:${{ matrix.cc }}:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:
414+
ccache:msvc:root:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:${{ github.ref }}
415+
ccache:msvc:root:${{ matrix.openmp }}:${{ matrix.cuda }}:${{ matrix.link }}:
439416
440417
- name: configure ccache
441418
# Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.
@@ -458,8 +435,6 @@ jobs:
458435
fi
459436
mkdir -p ${GITHUB_WORKSPACE}/build && cd ${GITHUB_WORKSPACE}/build
460437
cmake -G"Ninja Multi-Config" \
461-
-DCMAKE_C_COMPILER=${{ matrix.cc }} \
462-
-DCMAKE_CXX_COMPILER=${{ matrix.cc }} \
463438
-DCMAKE_BUILD_TYPE="Release" \
464439
-DCMAKE_INSTALL_PREFIX=".." \
465440
-DCMAKE_PREFIX_PATH="C:/Miniconda/envs/test/Library;${GITHUB_WORKSPACE}/dependencies" \
@@ -501,7 +476,7 @@ jobs:
501476
- name: save ccache
502477
# Save the cache after we are done (successfully) building
503478
# This helps to retain the ccache even if the subsequent steps are failing.
504-
uses: actions/cache/save@v4
479+
uses: actions/cache/save@v3
505480
with:
506481
path: ${{ steps.ccache-prepare.outputs.ccachedir }}
507482
key: ${{ steps.ccache-prepare.outputs.key }}
@@ -522,9 +497,7 @@ jobs:
522497
run: |
523498
cd ${GITHUB_WORKSPACE}/Example/build
524499
printf "::group::\033[0;32m==>\033[0m Configuring example\n"
525-
cmake -G"Ninja Multi-Config" \
526-
-DCMAKE_C_COMPILER=${{ matrix.cc }} \
527-
-DCMAKE_CXX_COMPILER=${{ matrix.cc }} \
500+
cmake \
528501
-DCMAKE_PREFIX_PATH="${GITHUB_WORKSPACE}/lib/cmake;C:/Miniconda/envs/test/Library;${GITHUB_WORKSPACE}/dependencies" \
529502
-DBLA_VENDOR="All" \
530503
${{ matrix.openmp-cmake-flags }} \
@@ -560,9 +533,7 @@ jobs:
560533
printf "::group:: \033[0;32m==>\033[0m Building with Config.cmake with library \033[0;32m${lib}\033[0m\n"
561534
cd ${GITHUB_WORKSPACE}/TestConfig/${lib}
562535
cd build
563-
cmake -G"Ninja Multi-Config" \
564-
-DCMAKE_C_COMPILER=${{ matrix.cc }} \
565-
-DCMAKE_CXX_COMPILER=${{ matrix.cc }} \
536+
cmake \
566537
-DCMAKE_PREFIX_PATH="${GITHUB_WORKSPACE}/lib/cmake;C:/Miniconda/envs/test/Library;${GITHUB_WORKSPACE}/dependencies" \
567538
..
568539
cmake --build . --config Release

0 commit comments

Comments
 (0)