Skip to content

Commit 88e9e8d

Browse files
committed
updated github workflows
1 parent fb42303 commit 88e9e8d

File tree

5 files changed

+42
-23
lines changed

5 files changed

+42
-23
lines changed

.github/workflows/build-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
name: Build the main version of the package
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: mochi-hpc/mochi-test-build-action@v1
14+
- uses: mochi-hpc/mochi-test-build-action@v2
1515
with:
1616
package-version: "@develop"

.github/workflows/build-latest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
name: Build the latest version of the package
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: mochi-hpc/mochi-test-build-action@v1
14+
- uses: mochi-hpc/mochi-test-build-action@v2
1515
with:
1616
build-cache-token: ${{ secrets.GITHUB_TOKEN }}
17+
push-only-dependencies: false

.github/workflows/build-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Build the main version of the package
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: mochi-hpc/mochi-test-build-action@v1
14+
- uses: mochi-hpc/mochi-test-build-action@v2
1515
with:
1616
package-version: "@main"
1717
build-cache-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,29 @@ jobs:
2121
with:
2222
ref: develop
2323

24-
- name: Install MPI
24+
- name: Set install root for Spack
2525
run: |
26-
sudo apt install -y libmpich-dev
27-
28-
- name: Find external packages
29-
run: |
30-
spack -e . external find --not-buildable cmake
31-
spack -e . external find --not-buildable perl
32-
spack -e . external find --not-buildable mpich
26+
spack -e tests config add config:install_tree:root:/opt/spack
27+
spack -e tests config add view:/opt/view
3328
3429
- name: Add mochi-spack-packages
3530
run: |
36-
git clone https://github.com/mochi-hpc/mochi-spack-packages /opt/spack/mochi-spack-packages
37-
spack -e . repo add /opt/spack/mochi-spack-packages
31+
git clone https://github.com/mochi-hpc/mochi-spack-packages
32+
spack -e tests repo add mochi-spack-packages
3833
3934
- name: Install spack environment
4035
run: |
41-
spack -e . concretize -f
42-
spack -e . install
36+
spack -e tests install
4337
4438
- name: Show spack-installed packages for debugging
4539
run: |
46-
spack -e . find -dlv
47-
48-
- name: Hack to make na+sm work
49-
run: |
50-
sudo /usr/sbin/sysctl kernel.yama.ptrace_scope=0
40+
spack -e tests find -dlv
5141
5242
- name: Build code run unit tests
5343
run: |
54-
eval `spack env activate --sh .` &&
55-
./prepare.sh &&
56-
./configure --prefix=`pwd` &&
44+
eval `spack env activate --sh tests`
45+
./prepare.sh
46+
./configure --prefix=`pwd`
5747
make check
5848
5949
- name: Show logs

tests/spack.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
spack:
2+
specs:
3+
- mochi-margo
4+
- mochi-bedrock
5+
- uuid
6+
- mochi-abt-io
7+
- autoconf
8+
- automake
9+
- jsoncpp
10+
- json-c
11+
- libtool
12+
- mochi-remi
13+
- pmdk
14+
- mercury~boostsys ^libfabric fabrics=tcp,rxm
15+
- mpich
16+
concretizer:
17+
unify: true
18+
modules:
19+
prefix_inspections:
20+
lib: [LD_LIBRARY_PATH]
21+
lib64: [LD_LIBRARY_PATH]
22+
mirrors:
23+
mochi-buildcache:
24+
url: oci://ghcr.io/mochi-hpc/mochi-spack-buildcache
25+
signed: false
26+
config:
27+
install_tree:
28+
padded_length: 128

0 commit comments

Comments
 (0)