Skip to content

Commit 85aa5b0

Browse files
CamStanCamStan
committed
change versions to test
change spack action change docs versions change to available gcc versions
1 parent c44d052 commit 85aa5b0

2 files changed

Lines changed: 45 additions & 48 deletions

File tree

‎.github/workflows/build-and-test.yml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: [ ubuntu-latest ]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 2
1616

@@ -24,9 +24,9 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
os: [ ubuntu-20.04 ]
27+
os: [ ubuntu-latest ]
2828
compiler: [ gcc ]
29-
gcc: [ 7, 8, 9, 10, 11 ]
29+
gcc: [ 9, 10, 11, 12, 13 ]
3030

3131
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.gcc }}
3232

@@ -39,11 +39,11 @@ jobs:
3939
steps:
4040
- name: Push checkout
4141
if: github.event_name == 'push'
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
- name: PR checkout
4545
if: github.event_name == 'pull_request'
46-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4747
with:
4848
ref: ${{ github.event.pull_request.head.sha }}
4949

@@ -60,13 +60,15 @@ jobs:
6060
sudo apt-get install libopenmpi-dev
6161
6262
- name: Install Spack
63-
uses: kzscisoft/install-spack@v1
63+
uses: spack/setup-spack@v2
6464
with:
65-
version: develop
65+
ref: develop
66+
path: spack
6667

6768
- name: Set up packages.yaml
6869
run: |
69-
test -f $GITHUB_WORKSPACE/.spack/etc/spack/packages.yaml || cat > $GITHUB_WORKSPACE/.spack/etc/spack/packages.yaml << 'EOF'
70+
gcc --version
71+
test -f $GITHUB_WORKSPACE/spack/etc/spack/packages.yaml || cat > $GITHUB_WORKSPACE/spack/etc/spack/packages.yaml << 'EOF'
7072
packages:
7173
all:
7274
target: [x86_64]
@@ -75,50 +77,50 @@ jobs:
7577
autoconf:
7678
buildable: False
7779
externals:
78-
- spec: "autoconf@2.69"
80+
- spec: "autoconf@2.71"
7981
prefix: /usr
8082
automake:
8183
buildable: False
8284
externals:
83-
- spec: "automake@1.16.1"
85+
- spec: "automake@1.16.5"
8486
prefix: /usr
8587
libtool:
8688
buildable: False
8789
externals:
88-
- spec: "libtool@2.4.6"
90+
- spec: "libtool@2.4.7"
8991
prefix: /usr
9092
m4:
9193
buildable: False
9294
externals:
93-
- spec: "m4@1.4.18"
95+
- spec: "m4@1.4.19"
9496
prefix: /usr
9597
openmpi:
9698
buildable: False
9799
externals:
98-
- spec: "openmpi@4.0.3"
100+
- spec: "openmpi@4.1.6"
99101
prefix: /usr
100102
openssl:
101103
buildable: False
102104
externals:
103-
- spec: "openssl@1.1.1f"
105+
- spec: "openssl@3.0.13"
104106
prefix: /usr
105107
pkg-config:
106108
buildable: False
107109
externals:
108-
- spec: "pkg-config@0.29.1"
110+
- spec: "pkg-config@0.29.2"
109111
prefix: /usr
110112
EOF
111113
spack compiler find --scope=user
112-
if [[ $CC == 'gcc-7' ]]; then
113-
spack config add "packages:all:compiler:[gcc@7.5.0]"
114-
elif [[ $CC == 'gcc-8' ]]; then
115-
spack config add "packages:all:compiler:[gcc@8.4.0]"
116-
elif [[ $CC == 'gcc-9' ]]; then
117-
spack config add "packages:all:compiler:[gcc@9.3.0]"
114+
if [[ $CC == 'gcc-9' ]]; then
115+
spack config add "packages:all:compiler:[gcc@9.5.0]"
116+
elif [[ $CC == 'gcc-10' ]]; then
117+
spack config add "packages:all:compiler:[gcc@10.5.0]"
118118
elif [[ $CC == 'gcc-11' ]]; then
119-
spack config add "packages:all:compiler:[gcc@11.1.0]"
119+
spack config add "packages:all:compiler:[gcc@11.5.0]"
120+
elif [[ $CC == 'gcc-12' ]]; then
121+
spack config add "packages:all:compiler:[gcc@12.4.0]"
120122
else
121-
spack config add "packages:all:compiler:[gcc@10.3.0]"
123+
spack config add "packages:all:compiler:[gcc@13.3.0]"
122124
fi
123125
spack external find
124126
spack config add modules:prefix_inspections:lib64:[LD_LIBRARY_PATH]

‎docs/requirements.txt‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,56 @@
44
#
55
# pip-compile --output-file=docs/requirements.txt --strip-extras docs/requirements.in
66
#
7-
alabaster==0.7.13
7+
alabaster==1.0.0
88
# via sphinx
9-
babel==2.14.0
9+
babel==2.17.0
1010
# via sphinx
11-
certifi==2023.11.17
11+
certifi==2025.8.3
1212
# via requests
13-
charset-normalizer==3.3.2
13+
charset-normalizer==3.4.3
1414
# via requests
15-
docutils==0.20.1
15+
docutils==0.21.2
1616
# via
1717
# sphinx
1818
# sphinx-rtd-theme
19-
idna==3.6
19+
idna==3.10
2020
# via requests
2121
imagesize==1.4.1
2222
# via sphinx
23-
jinja2==3.1.2
23+
jinja2==3.1.6
2424
# via sphinx
25-
markupsafe==2.1.3
25+
markupsafe==3.0.2
2626
# via jinja2
27-
packaging==23.2
27+
packaging==25.0
2828
# via sphinx
29-
pygments==2.17.2
29+
pygments==2.19.2
3030
# via sphinx
31-
requests==2.31.0
31+
requests==2.32.5
3232
# via sphinx
33-
snowballstemmer==2.2.0
33+
snowballstemmer==3.0.1
3434
# via sphinx
35-
sphinx==7.2.6
35+
sphinx==8.2.3
3636
# via
3737
# -r docs/requirements.in
3838
# sphinx-rtd-theme
39-
# sphinxcontrib-applehelp
40-
# sphinxcontrib-devhelp
41-
# sphinxcontrib-htmlhelp
4239
# sphinxcontrib-jquery
43-
# sphinxcontrib-qthelp
44-
# sphinxcontrib-serializinghtml
45-
sphinx-rtd-theme==2.0.0
40+
sphinx-rtd-theme==3.0.2
4641
# via -r docs/requirements.in
47-
sphinxcontrib-applehelp==1.0.7
42+
sphinxcontrib-applehelp==2.0.0
4843
# via sphinx
49-
sphinxcontrib-devhelp==1.0.5
44+
sphinxcontrib-devhelp==2.0.0
5045
# via sphinx
51-
sphinxcontrib-htmlhelp==2.0.4
46+
sphinxcontrib-htmlhelp==2.1.0
5247
# via sphinx
5348
sphinxcontrib-jquery==4.1
5449
# via sphinx-rtd-theme
5550
sphinxcontrib-jsmath==1.0.1
5651
# via sphinx
57-
sphinxcontrib-qthelp==1.0.6
52+
sphinxcontrib-qthelp==2.0.0
5853
# via sphinx
59-
sphinxcontrib-serializinghtml==1.1.9
54+
sphinxcontrib-serializinghtml==2.0.0
6055
# via sphinx
61-
urllib3==2.1.0
56+
urllib3==2.5.0
6257
# via requests
6358

6459
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)