Skip to content

Commit 0323ccc

Browse files
committed
Merge branch 'main' into v1.8.2_
2 parents 679b172 + bfb8eb4 commit 0323ccc

28 files changed

+512
-370
lines changed

.github/workflows/linux-clang.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ name: Linux - Clang
77
on:
88
workflow_dispatch:
99
push:
10-
branches: [ master ]
10+
branches: [ main ]
1111
tags: [ v* ]
1212
pull_request:
13-
branches: [ master ]
13+
branches: [ main ]
1414

1515
env:
1616
CONCURRENT_BUILD: 4
1717
CLANG_COMMAND: clang-14
1818
CLANGXX_COMMAND: clang++-14
19-
DOXYGEN_VER: 1.9.7
19+
DOXYGEN_VER: 1.12.0
2020
DOXYGEN_CACHE_REV: 0
21-
BOOST_VER: 1_82_0
22-
BOOST_VER_DOT: 1.82.0
21+
BOOST_VER: 1_86_0
22+
BOOST_VER_DOT: 1.86.0
2323
BOOST_BOOTSTRAP_TOOLSET: clang
2424
BOOST_TOOLSET: clang-14
2525
BOOST_CACHE_REV: 0
@@ -42,7 +42,7 @@ jobs:
4242
fi
4343
4444
- name: Cache Doxygen build
45-
uses: actions/cache@v3
45+
uses: actions/cache@v4
4646
with:
4747
path: .doxygen_build
4848
key: Linux-Clang-Doxygen-${{ env.DOXYGEN_VER }}-${{ env.DOXYGEN_CACHE_REV }}
@@ -75,7 +75,7 @@ jobs:
7575
clang-14
7676
7777
- name: Cache Boost build
78-
uses: actions/cache@v3
78+
uses: actions/cache@v4
7979
with:
8080
path: .boost_build
8181
key: Linux-Clang-Boost-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
@@ -112,8 +112,13 @@ jobs:
112112
graphviz \
113113
iwyu
114114
115+
- name: Checkout
116+
uses: actions/checkout@v4
117+
with:
118+
submodules: recursive
119+
115120
- name: Restore Doxygen build
116-
uses: actions/cache@v3
121+
uses: actions/cache@v4
117122
with:
118123
path: .doxygen_build
119124
key: Linux-Clang-Doxygen-${{ env.DOXYGEN_VER }}-${{ env.DOXYGEN_CACHE_REV }}
@@ -124,11 +129,6 @@ jobs:
124129
cd .doxygen_build/doxygen-${{ env.DOXYGEN_VER }}/build
125130
sudo make -j ${{ env.CONCURRENT_BUILD }} install
126131
127-
- name: Checkout
128-
uses: actions/checkout@v3
129-
with:
130-
submodules: recursive
131-
132132
- name: Configure
133133
shell: bash
134134
run: |
@@ -142,7 +142,7 @@ jobs:
142142
../configure $DISTCHECK_CONFIGURE_FLAGS
143143
144144
- name: Cache documents
145-
uses: actions/cache@v3
145+
uses: actions/cache@v4
146146
with:
147147
path: .doxygen/doc
148148
key: Linux-Clang-documents-${{ github.run_number }}
@@ -171,12 +171,12 @@ jobs:
171171
iwyu
172172
173173
- name: Checkout
174-
uses: actions/checkout@v3
174+
uses: actions/checkout@v4
175175
with:
176176
submodules: recursive
177177

178178
- name: Restore Boost build
179-
uses: actions/cache@v3
179+
uses: actions/cache@v4
180180
with:
181181
path: .boost_build
182182
key: Linux-Clang-Boost-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
@@ -223,12 +223,12 @@ jobs:
223223
iwyu
224224
225225
- name: Checkout
226-
uses: actions/checkout@v3
226+
uses: actions/checkout@v4
227227
with:
228228
submodules: recursive
229229

230230
- name: Restore Boost build
231-
uses: actions/cache@v3
231+
uses: actions/cache@v4
232232
with:
233233
path: .boost_build
234234
key: Linux-Clang-Boost-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
@@ -252,7 +252,7 @@ jobs:
252252
../configure $DISTCHECK_CONFIGURE_FLAGS
253253
254254
- name: Cache archives
255-
uses: actions/cache@v3
255+
uses: actions/cache@v4
256256
with:
257257
path: .build/tetengo-*
258258
key: Linux-Clang-archives-${{ github.run_number }}
@@ -276,13 +276,13 @@ jobs:
276276
needs: [ doxygen, build ]
277277
steps:
278278
- name: Restore documents
279-
uses: actions/cache@v3
279+
uses: actions/cache@v4
280280
with:
281281
path: .doxygen/doc
282282
key: Linux-Clang-documents-${{ github.run_number }}
283283

284284
- name: Restore archives
285-
uses: actions/cache@v3
285+
uses: actions/cache@v4
286286
with:
287287
path: .build/tetengo-*
288288
key: Linux-Clang-archives-${{ github.run_number }}
@@ -295,7 +295,7 @@ jobs:
295295
mv .build/tetengo-* .artifacts
296296
297297
- name: Upload artifacts
298-
uses: actions/upload-artifact@v3
298+
uses: actions/upload-artifact@v4
299299
with:
300300
name: artifacts-linux
301301
path: .artifacts

.github/workflows/linux-gcc.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ name: Linux - GCC
77
on:
88
workflow_dispatch:
99
push:
10-
branches: [ master ]
10+
branches: [ main ]
1111
tags: [ v* ]
1212
pull_request:
13-
branches: [ master ]
13+
branches: [ main ]
1414

1515
env:
1616
CONCURRENT_BUILD: 4
1717
GCC_COMMAND: gcc-12
1818
GXX_COMMAND: g++-12
19-
BOOST_VER: 1_82_0
20-
BOOST_VER_DOT: 1.82.0
19+
BOOST_VER: 1_86_0
20+
BOOST_VER_DOT: 1.86.0
2121
BOOST_BOOTSTRAP_TOOLSET: gcc
2222
BOOST_TOOLSET: gcc-12
2323
BOOST_CACHE_REV: 0
@@ -36,7 +36,7 @@ jobs:
3636
g++-12
3737
3838
- name: Cache Boost build
39-
uses: actions/cache@v3
39+
uses: actions/cache@v4
4040
with:
4141
path: .boost_build
4242
key: Linux-GCC-Boost-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
@@ -71,12 +71,12 @@ jobs:
7171
g++-12
7272
7373
- name: Checkout
74-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7575
with:
7676
submodules: recursive
7777

7878
- name: Restore Boost build
79-
uses: actions/cache@v3
79+
uses: actions/cache@v4
8080
with:
8181
path: .boost_build
8282
key: Linux-GCC-Boost-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}

0 commit comments

Comments
 (0)