Skip to content

Commit

Permalink
Merge pull request #178 from arkedge/develop
Browse files Browse the repository at this point in the history
Update main (v4.0.0) on 2023-11-02
  • Loading branch information
meltingrabbit authored Nov 2, 2023
2 parents 94699ae + d760c10 commit 3481aba
Show file tree
Hide file tree
Showing 693 changed files with 14,455 additions and 6,166 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build]
target = "i686-unknown-linux-gnu"
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/action_item.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ assignees: ''

---

## 概要
ひとことで

## 詳細
詳しく

Expand All @@ -19,8 +16,10 @@ assignees: ''
## 備考
なにかあれば

<!--
## 注意
- 関連する Projects が存在する場合,それの紐付けを行うこと
- 可能ならば `priority` ラベルを付けること
- 可能ならば Assignees を設定すること
- close するときは結論を明記すること
-->
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
labels: ['bug']
assignees: ''

---

## 概要
ひとことで

## 詳細
### 詳細症状
どういうバグか
Expand All @@ -30,8 +27,10 @@ tool類が全部死ぬ... みたいな
## 補足
何かれば

<!--
## 注意
- 関連する Projects が存在する場合,それの紐付けを行うこと
- 可能ならば `priority` ラベルを付けること
- 可能ならば Assignees を設定すること
- close するときは結論を明記すること
-->
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ XX系の動作がガラッと変わる,とか.
## 補足
何かあれば

<!--
## 注意
- 関連する Projects が存在する場合,それの紐付けを行うこと
- Assignees を設定すること
- 可能ならば Reviewers を設定すること
- 可能ならば `priority` ラベルを付けること
-->
2 changes: 1 addition & 1 deletion .github/workflows/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11
3.12
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
actionlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1
- uses: reviewdog/action-actionlint@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
pull_request:

jobs:
minimum_user:
name: minimum user
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.5.0
mobc:
name: mobc
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v4.5.2
with:
c2a_dir: Examples/minimum_user
c2a_dir: examples/mobc
c2a_custom_setup: |
cd ../..
pwd
Expand All @@ -23,11 +23,11 @@ jobs:
./setup.sh
fi
second_obc_user:
name: 2nd obc user
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.5.0
subobc:
name: subobc
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v4.5.2
with:
c2a_dir: Examples/2nd_obc_user
c2a_dir: examples/subobc
c2a_custom_setup: |
cd ../..
pwd
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_as_cxx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ jobs:
fail-fast: false
matrix:
example:
- minimum_user
- 2nd_obc_user
- mobc
- subobc

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: setup
shell: cmd
run: ./setup.bat

- name: cmake
working-directory: ./Examples/${{ matrix.example }}/src/s2e_mockup
working-directory: ./examples/${{ matrix.example }}/src/s2e_mockup
run: |
mkdir build
cd build
cmake --version
cmake .. -A Win32
- name: build
working-directory: ./Examples/${{ matrix.example }}/src/s2e_mockup/build
working-directory: ./examples/${{ matrix.example }}/src/s2e_mockup/build
run: cmake --build .
16 changes: 9 additions & 7 deletions .github/workflows/build_with_s2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:

env:
S2E_CORE_VERSION: v6.0.0
# renovate: datasource=github-releases depName=ut-issl/s2e-core
S2E_CORE_VERSION: v7.0.1

jobs:
build_s2e_win:
Expand All @@ -18,27 +19,28 @@ jobs:
fail-fast: false
matrix:
example:
- minimum_user
- 2nd_obc_user
- mobc
- subobc

steps:
- name: checkout S2E core
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
with:
path: s2e-core
repository: ut-issl/s2e-core
ref: '${{ env.S2E_CORE_VERSION }}'
fetch-depth: 1

- name: checkout S2E user
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
with:
path: s2e-user
repository: ut-issl/s2e-user-for-c2a-core
ref: ae-v3.0.0 # TODO: import s2e-user-for-c2a-core to c2a-core
fetch-depth: 1

- name: checkout C2A user
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
with:
path: c2a-core

Expand Down Expand Up @@ -95,5 +97,5 @@ jobs:
run: |
cl.exe
cmake --version
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/${{ matrix.example }} -DUSE_C2A=ON
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/${{ matrix.example }} -DUSE_C2A=ON
cmake --build . --clean-first
36 changes: 36 additions & 0 deletions .github/workflows/check_code_generation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: check tlm_cmd code generation

on:
push:
branches:
- main
- develop
pull_request:

jobs:
check_code_generate:
strategy:
fail-fast: false
matrix:
user:
- mobc
- subobc

runs-on: ubuntu-latest

steps:
- uses: actions/[email protected]

- name: run code-generator
working-directory: ./code-generator
run: |
cp "./settings_${{ matrix.user }}.json" ./settings.json
python GenerateC2ACode.py
- name: check diff
run: |
git add .
if ! git diff --exit-code --cached; then
echo "threre are some diff after code generation"
exit 1
fi
68 changes: 11 additions & 57 deletions .github/workflows/check_coding_rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,63 +8,17 @@ on:
pull_request:

jobs:
check_coding_rule:
runs-on: ubuntu-latest
check_coding_rule_v4:
strategy:
fail-fast: false
matrix:
example:
- minimum_user
- 2nd_obc_user

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version-file: .github/workflows/.python-version
architecture: 'x64'
- name: setup
shell: bash
run: ./setup.sh
- name: check coding rule
id: check
shell: bash -e {0}
continue-on-error: true
working-directory: ./Examples/${{ matrix.example }}/src
run: |
python ./src_core/Script/CI/check_coding_rule.py ./src_core/Script/CI/check_coding_rule.json | tee /tmp/coding-rule.log
status="${PIPESTATUS[0]}"
echo "status: ${status}"
echo "status=${status}" >> "$GITHUB_OUTPUT"
exit "${status}"
- name: install reviewdog
uses: reviewdog/[email protected]

- name: fix error log source file path
run: |
sed 's/.\/src_core\///g' < /tmp/coding-rule.log \
| > ./coding-rule.log \
sed 's/.\/src_user/Examples\/${{ matrix.example }}\/src\/src_user/g'
cat ./coding-rule.log
- name: reviewdog(github-pr-review)
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
reviewdog \
-name 'check_coding_rule' \
-level error \
-fail-on-error=true \
-filter-mode=added \
-diff="git diff FETCH_HEAD" \
-reporter=github-pr-review \
-efm="%-GThe above files are invalid coding rule." \
-efm="%E%f: %l: %m" \
-efm="%Z%s" \
< coding-rule.log
- name: exit
shell: bash
run: |
exit $(( "${{ steps.check.outputs.status }}" ))
user:
- mobc
- subobc
uses: arkedge/workflows-c2a/.github/workflows/[email protected]
with:
c2a_dir: examples/${{ matrix.user }}
c2a_custom_setup: |
cd ../..
pwd
./setup.sh
4 changes: 2 additions & 2 deletions .github/workflows/check_encoding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
check_encoding:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v4
with:
python-version-file: .github/workflows/.python-version
architecture: 'x64'
- run: pip install chardet
- name: check_encoding
run: python ./check_encoding.py ./check_encoding.json
working-directory: ./Script/CI
working-directory: ./script/ci
4 changes: 2 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v4
uses: crazy-max/ghaction-github-labeler@v5.0.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
yaml-file: .github/labels.yml
Expand Down
Loading

0 comments on commit 3481aba

Please sign in to comment.