From f03a0f8453f1c3ab7a18924024e28f4dad9a04a8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Mar 2023 00:59:26 +0000 Subject: [PATCH 01/12] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..39a2b6e --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From 0ec76a8f96aafff4a32525ff621fb720fb97edc6 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Wed, 5 Jul 2023 08:14:07 +0200 Subject: [PATCH 02/12] Modify label --- .github/labels.yml | 68 +++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/labels.yml b/.github/labels.yml index ff5dcde..f0ea8df 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -1,55 +1,55 @@ -- name: "bug" - color: "d73a4a" +- name: ":bug: bug" + color: "F9D0C4" description: "Something isn't working" -- name: "documentation" - color: "0075ca" +- name: ":notebook: documentation" + color: "F0F0F0" description: "Improvements or additions to documentation" -- name: "good first issue" +- name: ":beginner: good first issue" description: "Good for newcomers" - color: "7057ff" + color: "F0F0F0" -- name: "question" +- name: ":question: question" description: "Further information is requested" - color: "d876e3" + color: "F0F0F0" -- name: "priority::high" - description: "priorityg high" - color: "d93f0b" +- name: ":rocket: priority::high" + description: "priority high" + color: "F9D0C4" -- name: "priority::low" +- name: ":car: priority::low" description: "priority low" - color: "9dcce0" + color: "C2E0C6" -- name: "priority::medium" +- name: ":airplane: priority::medium" description: "priority medium" - color: "fbca04" + color: "FEF2C0" -- name: "major update" - color: "B60205" +- name: ":whale: major update" + color: "F9D0C4" description: "Major update" -- name: "minor update" - color: "EFFA85" +- name: ":dolphin: minor update" + color: "FEF2C0" description: "Minor update" -- name: "patch" - color: "08C036" - description: "Patch" +- name: ":fish: patch" + color: "C2E0C6" + description: "Patch Update" -- name: "tools" - description: "" - color: "510f70" +- name: ":wrench: tools" + description: "Tools" + color: "F0F0F0" -- name: "C2A" - description: "" - color: "2a9637" +- name: ":artificial_satellite: C2A" + description: "Command Centric Architecture" + color: "F0F0F0" -- name: "S2E" - description: "" - color: "eef789" +- name: ":ringed_planet: S2E" + description: "Spacecraft Simulation Environment" + color: "F0F0F0" -- name: "WINGS" - description: "" - color: "1503bb" +- name: ":satellite: WINGS" + description: "Web-based INterface Ground-station Software" + color: "F0F0F0" From e6435e0f7119954f8da312ec4e91e36117f2bd90 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Fri, 14 Jul 2023 10:09:36 +0200 Subject: [PATCH 03/12] Remove SSH key and update c2a version --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04e0b24..40653f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: - 'src/**' env: - C2A_AOBC_VERSION: v5.0.1 + C2A_AOBC_VERSION: v6.0.1 jobs: build_s2e_win: @@ -41,7 +41,6 @@ jobs: repository: ut-issl/c2a-aobc ref: '${{ env.C2A_AOBC_VERSION }}' submodules: recursive - ssh-key: ${{ secrets.C2A_AOBC_SSH_KEY }} fetch-depth: 1 - name: Configure build for x86 @@ -125,7 +124,6 @@ jobs: repository: ut-issl/c2a-aobc ref: '${{ env.C2A_AOBC_VERSION }}' submodules: recursive - ssh-key: ${{ secrets.C2A_AOBC_SSH_KEY }} fetch-depth: 1 - name: set compiler From 3362fe28200c7190c244f08a3bc93ee50b2a9828 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Fri, 14 Jul 2023 11:41:53 +0200 Subject: [PATCH 04/12] Fix PR template --- .github/PULL_REQUEST_TEMPLATE.md | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 82728e7..1074a20 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,23 +1,27 @@ -## 概要 -ひとことで - ## Issue - 関連する issue ## 詳細 -詳しく +詳しくPR内容を記述する ## 検証結果 -test へのリンクや，検証結果へのリンク - -## 影響範囲 -XX系の動作がガラッと変わる，とか． +test へのリンクや，検証結果へのリンク、検証結果の画像を貼り付ける。 ## 補足 -何かあれば +何かあれば書く。なければ`NA`とする。 ## 注意 -- 関連する Projects が存在する場合，それの紐付けを行うこと -- Assignees を設定すること -- 可能ならば Reviewers を設定すること -- 可能ならば `priority` ラベルを付けること +- 必ず`Reviewers` を設定すること + - AOCSメンテナメンバー +- `Assignees` を自分自身に割り当てること +- `Projects`として`6U AOCS team (private)`を設定する + - `Status`を`Waiting Review`に設定する +- 必ず`priority` ラベルを付けること + - high: 試験などの関係ですぐさまレビューしてほしい + - middle: 通常これ + - low: ゆっくりで良いもの +- 必ず`update`ラベルをつけること + - major: 後方互換性なしのI/F変更 + - minor: 後方互換性ありのI/F変更 + - patch: I/F変更なし +- テンプレート記述は残さず、削除したり`NA`と書き換えたりする From a09e12064373d14aeb4eee08c44d9769d1815289 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Fri, 14 Jul 2023 11:42:00 +0200 Subject: [PATCH 05/12] Fix AI template --- .github/ISSUE_TEMPLATE/action_item.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/action_item.md b/.github/ISSUE_TEMPLATE/action_item.md index 5c06b8b..f5491c4 100644 --- a/.github/ISSUE_TEMPLATE/action_item.md +++ b/.github/ISSUE_TEMPLATE/action_item.md @@ -7,9 +7,6 @@ assignees: '' --- -## 概要 -ひとことで - ## 詳細 詳しく @@ -20,7 +17,15 @@ assignees: '' なにかあれば ## 注意 -- 関連する Projects が存在する場合，それの紐付けを行うこと -- 可能ならば `priority` ラベルを付けること -- 可能ならば Assignees を設定すること -- close するときは結論を明記すること +- 割り当てれるなら`Assignees`を割り当てる +- `Projects`として`6U AOCS team (private)`を設定する + - `Status`を`ToDo`などに設定する +- 必ず`priority` ラベルを付けること + - high: 試験などの関係ですぐさま対応してほしい + - middle: 通常これ + - low: ゆっくりで良いもの +- 必ず`update`ラベルをつけること + - major: 後方互換性なしのI/F変更 + - minor: 後方互換性ありのI/F変更 + - patch: I/F変更なし +- テンプレート記述は残さず、削除したり`NA`と書き換えたりする From fb6e245de9a1950c72f0763ff992189698345133 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Fri, 14 Jul 2023 11:45:19 +0200 Subject: [PATCH 06/12] Fix bug report template --- .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7c03c96..a7223e6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,15 +7,21 @@ assignees: '' --- -## 概要 -ひとことで - ## 詳細 ### 詳細症状 -どういうバグか +どういうバグか、バグを再現できるように詳細に記述する ### 発生条件 -発生した環境，症状，パラメタなど +- 発生した環境 + - SILS, HILS, or 実機 + - ビルド、実行環境のバージョン情報など + - C2A-AOBCのバージョン + - S2E-AOBCのバージョン + - Visual Studioなどの情報 +- 症状 + - 可能ならば図などもつけて +- パラメータ + - デフォルトから変更した点があるなら記入する ### 追加資料 あればリンクなどを貼る @@ -31,7 +37,17 @@ tool類が全部死ぬ... みたいな 何かれば ## 注意 -- 関連する Projects が存在する場合，それの紐付けを行うこと -- 可能ならば `priority` ラベルを付けること -- 可能ならば Assignees を設定すること -- close するときは結論を明記すること +- 割り当てれるなら`Assignees`を割り当てる +- `Projects`として`6U AOCS team (private)`を設定する + - `Status`を`ToDo`などに設定する +- 必ず`bug`ラベルを付けること +- 必ず`priority` ラベルを付けること + - high: 試験などの関係ですぐさま対応してほしい + - middle: 通常これ + - low: ゆっくりで良いもの +- 必ず`update`ラベルをつけること + - major: 後方互換性なしのI/F変更 + - minor: 後方互換性ありのI/F変更 + - patch: I/F変更なし +- テンプレート記述は残さず、削除したり`NA`と書き換えたりする + From ad4a10c13fb9c2ae8faa8b9d10ae0fb36f14bca0 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Fri, 14 Jul 2023 14:30:54 +0200 Subject: [PATCH 07/12] Add develop branch to execute labeler --- .github/workflows/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index e2f01a6..2a0210f 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - develop pull_request: paths: - .github/workflows/labeler.yml From de14e59f3f779712c9362f5e9ca73c2e383101ba Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 15 Jul 2023 09:55:11 +0200 Subject: [PATCH 08/12] Add code owner --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..6557e4f --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @ut-issl/aocs @sksat From 8bf319105696362602298ba6af3a1b995d40da48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:11:12 +0000 Subject: [PATCH 09/12] Update actions/checkout action to v3 --- .github/workflows/actionlint.yml | 2 +- .github/workflows/labeler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml index 274d11e..4ef847a 100644 --- a/.github/workflows/actionlint.yml +++ b/.github/workflows/actionlint.yml @@ -9,7 +9,7 @@ jobs: actionlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: reviewdog/action-actionlint@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 2a0210f..3c267f9 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run Labeler uses: crazy-max/ghaction-github-labeler@v3 From 8c2a1d6c68b7ceb4a4f99f4747acd465167a0a58 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:13:53 +0000 Subject: [PATCH 10/12] Update crazy-max/ghaction-github-labeler action to v4 --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 3c267f9..c174614 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - name: Run Labeler - uses: crazy-max/ghaction-github-labeler@v3 + uses: crazy-max/ghaction-github-labeler@v4 with: github-token: ${{ secrets.GITHUB_TOKEN }} yaml-file: .github/labels.yml From 0bf0c5e4325dfba7e6dfd61a51e4e8bc68877cb4 Mon Sep 17 00:00:00 2001 From: satoshi_ikari Date: Tue, 1 Aug 2023 05:19:52 +0900 Subject: [PATCH 11/12] Fix default build setting for Visual Studio --- CMakeSettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index a6b43b5..d3f3965 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -2,7 +2,7 @@ "configurations": [ { "name": "Win32", - "generator": "Visual Studio 16 2019", + "generator": "Visual Studio 17 2022", "configurationType": "Debug", "inheritEnvironments": [ "msvc_x86" From c95c74173b79e44a679428265daee470172cd4cd Mon Sep 17 00:00:00 2001 From: satoshi_ikari Date: Tue, 1 Aug 2023 05:21:50 +0900 Subject: [PATCH 12/12] Update version info --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57ae709..fa446cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_policy(SET CMP0048 NEW) project(S2E_AOBC LANGUAGES CXX DESCRIPTION "S2E_AOBC" - VERSION 3.0.0 + VERSION 3.0.2 ) cmake_minimum_required(VERSION 3.13)