Skip to content

Commit 954ea0d

Browse files
meltingrabbitmeltingrabbit
authored
Merge pull request #371 from ut-issl/develop
Update main (v3.6.0) on 2022-06-29
2 parents 76c7f78 + 577e7cd commit 954ea0d

File tree

389 files changed

+20969
-17908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+20969
-17908
lines changed

‎.github/workflows/.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.10

‎.github/workflows/actionlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
actionlint:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: reviewdog/action-actionlint@v1
1414
with:
1515
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build_as_c89.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ jobs:
4949
matrix: ${{ fromJson(needs.gen_build_matrix.outputs.matrix) }}
5050

5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
5353

5454
- name: install deps
5555
run: |
56+
sudo apt-get update
5657
sudo apt-get install -y libc6-dev-i386 nkf
5758
5859
# - name: convert Shift-JIS to UTF-8
@@ -79,23 +80,24 @@ jobs:
7980
echo "::set-output name=WEXTRA::${WEXTRA}"
8081
8182
- name: cmake
82-
working-directory: ./Examples/minimum_user_for_s2e
83+
working-directory: ./Examples/minimum_user
8384
env:
8485
CC: ${{ matrix.compiler }}
8586
run: |
8687
mkdir build
8788
cd build
89+
cmake --version
8890
cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_SILS_MOCKUP=ON -DADD_WERROR_FLAGS=${{ steps.compile_flags.outputs.WERROR }} -DADD_WEXTRA_FLAGS=${{ steps.compile_flags.outputs.WEXTRA }}
8991
9092
- name: build
9193
id: build
9294
continue-on-error: ${{ matrix.compiler == 'clang' }}
93-
working-directory: ./Examples/minimum_user_for_s2e/build
95+
working-directory: ./Examples/minimum_user/build
9496
run: cmake --build .
9597

9698
- name: run
9799
if: steps.build.outcome == 'success'
98-
working-directory: ./Examples/minimum_user_for_s2e/build
100+
working-directory: ./Examples/minimum_user/build
99101
shell: bash
100102
run: timeout 3 ./C2A || exit 0
101103

@@ -110,22 +112,22 @@ jobs:
110112

111113
- name: clang-tidy
112114
if: matrix.compiler == 'clang'
113-
working-directory: ./Examples/minimum_user_for_s2e/build
115+
working-directory: ./Examples/minimum_user/build
114116
run: |
115117
run-clang-tidy-11 \
116118
| sed 's/\/home\/runner\/work\/c2a-core\/c2a-core\///g' \
117-
| sed 's/Examples\/minimum_user_for_s2e\/src\/src_core\///g' \
119+
| sed 's/Examples\/minimum_user\/src\/src_core\///g' \
118120
> clang_tidy.log
119121
120122
- name: clang-tidy result
121123
if: matrix.compiler == 'clang'
122-
working-directory: ./Examples/minimum_user_for_s2e/build
124+
working-directory: ./Examples/minimum_user/build
123125
run: cat clang_tidy.log
124126

125127
- name: remove duplicate error
126128
if: matrix.compiler == 'clang'
127129
run: |
128-
python Script/CI/remove_duplicate_error.py ./Examples/minimum_user_for_s2e/build/clang_tidy.log "clang-tidy" | tee clang_tidy.log
130+
python Script/CI/remove_duplicate_error.py ./Examples/minimum_user/build/clang_tidy.log "clang-tidy" | tee clang_tidy.log
129131
130132
- name: reviewdog clang-tidy (github-pr-review)
131133
if: matrix.compiler == 'clang' && matrix.warning == 'Werror'

‎.github/workflows/build_as_cxx.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,41 @@ jobs:
1111
build_minimum_user_as_cxx:
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: setup
1717
shell: cmd
1818
run: ./setup.bat
1919

2020
- name: cmake
21-
working-directory: ./Examples/minimum_user_for_s2e
21+
working-directory: ./Examples/minimum_user
2222
run: |
2323
mkdir build
2424
cd build
25+
cmake --version
2526
cmake .. -A Win32
2627
2728
- name: build
28-
working-directory: ./Examples/minimum_user_for_s2e/build
29+
working-directory: ./Examples/minimum_user/build
2930
run: cmake --build .
3031

3132
build_s2e_mockup:
3233
runs-on: windows-latest
3334
steps:
34-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
3536

3637
- name: setup
3738
shell: cmd
3839
run: ./setup.bat
3940

4041
- name: cmake
41-
working-directory: ./Examples/minimum_user_for_s2e/src/s2e_mockup
42+
working-directory: ./Examples/minimum_user/src/s2e_mockup
4243
run: |
4344
mkdir build
4445
cd build
46+
cmake --version
4547
cmake .. -A Win32
4648
4749
- name: build
48-
working-directory: ./Examples/minimum_user_for_s2e/src/s2e_mockup/build
50+
working-directory: ./Examples/minimum_user/src/s2e_mockup/build
4951
run: cmake --build .

‎.github/workflows/build_with_s2e.yml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: build with S2E
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- develop
8+
pull_request:
9+
10+
env:
11+
S2E_CORE_VERSION: v5.0.0
12+
13+
jobs:
14+
build_s2e_win:
15+
name: Build on Windows VS2022
16+
runs-on: windows-2022
17+
18+
steps:
19+
- name: checkout S2E core
20+
uses: actions/checkout@v3
21+
with:
22+
path: s2e-core
23+
repository: ut-issl/s2e-core
24+
ref: '${{ env.S2E_CORE_VERSION }}'
25+
fetch-depth: 1
26+
27+
- name: checkout S2E user
28+
uses: actions/checkout@v3
29+
with:
30+
path: s2e-user
31+
repository: ut-issl/s2e-user-for-c2a-core
32+
fetch-depth: 1
33+
34+
- name: checkout C2A user
35+
uses: actions/checkout@v3
36+
with:
37+
path: c2a-core
38+
39+
- name: setup C2A
40+
shell: cmd
41+
working-directory: c2a-core
42+
run: setup.bat
43+
44+
- name: Configure build for x86
45+
uses: ilammy/msvc-dev-cmd@v1
46+
with:
47+
arch: amd64_x86
48+
49+
- name: cache extlib
50+
id: cache-extlib
51+
uses: actions/cache@v3
52+
with:
53+
key: extlib-${{ runner.os }}-${{ hashFiles('./s2e-core/ExtLibraries/**') }}
54+
path: ./s2e-core/ExtLibraries
55+
56+
- name: build extlib
57+
if: steps.cache-extlib.outputs.cache-hit != 'true'
58+
shell: powershell
59+
working-directory: ./s2e-core/ExtLibraries
60+
run: |
61+
$extlib_dir=(pwd).Path
62+
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR="${extlib_dir}"
63+
cmake --build . --clean-first
64+
65+
- name: install extlib
66+
if: steps.cache-extlib.outputs.cache-hit != 'true'
67+
shell: powershell
68+
working-directory: ./s2e-core/ExtLibraries
69+
run: |
70+
cmake --install .
71+
72+
- name: check extlib
73+
shell: powershell
74+
working-directory: ./s2e-core/ExtLibraries
75+
run: |
76+
ls cspice
77+
ls cspice/cspice_msvs/lib
78+
ls cspice/include
79+
ls cspice/generic_kernels
80+
ls nrlmsise00
81+
ls nrlmsise00/table
82+
ls nrlmsise00/lib
83+
ls nrlmsise00/lib/libnrlmsise00.lib
84+
ls nrlmsise00/src
85+
86+
- name: build
87+
working-directory: ./s2e-user
88+
shell: cmd
89+
run: |
90+
cl.exe
91+
cmake --version
92+
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=../s2e-core/ExtLibraries -DFLIGHT_SW_DIR=../c2a-core -DC2A_NAME=Examples/minimum_user -DUSE_C2A=ON
93+
cmake --build . --clean-first

‎.github/workflows/check_coding_rule.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
check_coding_rule:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-python@v4
1616
with:
17-
python-version: '3.x'
17+
python-version-file: .github/workflows/.python-version
1818
architecture: 'x64'
1919
- name: setup
2020
shell: bash
@@ -23,7 +23,7 @@ jobs:
2323
id: check
2424
shell: bash -e {0}
2525
continue-on-error: true
26-
working-directory: ./Examples/minimum_user_for_s2e/src
26+
working-directory: ./Examples/minimum_user/src
2727
run: |
2828
python ./src_core/Script/CI/check_coding_rule.py ./src_core/Script/CI/check_coding_rule.json | tee /tmp/coding-rule.log
2929
status="${PIPESTATUS[0]}"
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
sed 's/.\/src_core\///g' < /tmp/coding-rule.log \
4040
| > ./coding-rule.log \
41-
sed 's/.\/src_user/Examples\/minimum_user_for_s2e\/src\/src_user/g'
41+
sed 's/.\/src_user/Examples\/minimum_user\/src\/src_user/g'
4242
cat ./coding-rule.log
4343
4444
- name: reviewdog(github-pr-review)

‎.github/workflows/check_encoding.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
check_encoding:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-python@v4
1616
with:
17-
python-version: '3.x'
17+
python-version-file: .github/workflows/.python-version
1818
architecture: 'x64'
1919
- run: pip install chardet
2020
- name: check_encoding

‎.github/workflows/labeler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818

1919
- name: Run Labeler
20-
uses: crazy-max/ghaction-github-labeler@v3
20+
uses: crazy-max/ghaction-github-labeler@v4
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
yaml-file: .github/labels.yml

‎.github/workflows/python_check_format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
black_format:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
# - name: check python format with black
1717
# uses: psf/black@stable
1818

19-
- uses: reviewdog/action-black@v2
19+
- uses: reviewdog/action-black@v3
2020
with:
2121
github_token: ${{ secrets.GITHUB_TOKEN }}
2222
# reporter: github-pr-review # TODO: いい感じになったら直す

‎.github/workflows/python_lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
flake8_lint:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up python environment
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v4
1818
with:
19-
python-version: "3.8"
19+
python-version-file: .github/workflows/.python-version
2020

2121
- name: flake8 Lint
2222
uses: reviewdog/action-flake8@v3

0 commit comments

Comments
 (0)