Merge pull request #245 from ut-issl/hotfix/build-ci-exit

Fix Build CI exit value
ut-issl · Feb 8, 2022 · bfced57 · bfced57
2 parents 9d4717b + 4718517
commit bfced57
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/build_as_c89.yml b/.github/workflows/build_as_c89.yml
@@ -164,3 +164,8 @@ jobs:
             -efm="%E%f:%l:%c: error: %m" \
             -efm="%C%m" \
             < clang_tidy.log
+
+      - name: build failed
+        if: steps.build.outcome == 'failure'
+        shell: bash
+        run: exit 1
diff --git a/Applications/memory_dump.c b/Applications/memory_dump.c
@@ -10,7 +10,11 @@
 static MemoryDump memory_dump_;
 const MemoryDump* const memory_dump = &memory_dump_;
 
+// FIXME: CTCP 大改修が終わったら直す
+// https://github.com/ut-issl/c2a-core/pull/217
+#if 0
 static CommonTlmPacket MEM_ctp_; // データサイズが大きいのでstatic確保
+#endif
 
 static void MEM_init_(void);
 

diff --git a/Examples/minimum_user_for_s2e/src/src_user/Drivers/Aocs/aobc.h b/Examples/minimum_user_for_s2e/src/src_user/Drivers/Aocs/aobc.h
@@ -21,7 +21,7 @@
 typedef enum
 {
   AOBC_TX_ERR_CODE_OK   = 0,
-  AOBC_TX_ERR_CODE_CMD_NOT_FOUND,
+  AOBC_TX_ERR_CODE_CMD_NOT_FOUND
 } AOBC_TX_ERR_CODE;
 
 /**
@@ -33,7 +33,7 @@ typedef enum
 {
   AOBC_RX_ERR_CODE_OK   = 0,
   AOBC_RX_ERR_CODE_TLM_NOT_FOUND,
-  AOBC_RX_ERR_CODE_CRC_ERR,
+  AOBC_RX_ERR_CODE_CRC_ERR
 } AOBC_RX_ERR_CODE;
 
 /**

diff --git a/TlmCmd/Ccsds/cmd_space_packet.h b/TlmCmd/Ccsds/cmd_space_packet.h
@@ -48,7 +48,7 @@
 typedef enum
 {
   CSP_2ND_HDR_VER_UNKNOWN = 0,  //!< バージョン不定
-  CSP_2ND_HDR_VER_1 = 1,        //!< Version-1
+  CSP_2ND_HDR_VER_1 = 1         //!< Version-1
 } CSP_2ND_HDR_VER;
 
 

diff --git a/TlmCmd/Ccsds/tlm_space_packet.h b/TlmCmd/Ccsds/tlm_space_packet.h
@@ -61,7 +61,7 @@
 typedef enum
 {
   TSP_2ND_HDR_VER_UNKNOWN = 0,  //!< バージョン不定
-  TSP_2ND_HDR_VER_1 = 1,        //!< Version-1
+  TSP_2ND_HDR_VER_1 = 1         //!< Version-1
 } TSP_2ND_HDR_VER;
 
 

diff --git a/TlmCmd/packet_list.h b/TlmCmd/packet_list.h
@@ -27,7 +27,7 @@ typedef enum
   PL_PACKET_TYPE_CTCP,    //!< CommonTlmCmdPacket
   PL_PACKET_TYPE_CTP,     //!< CommonTlmPacket
   PL_PACKET_TYPE_CCP,     //!< CommonCmdPacket
-  PL_PACKET_TYPE_OTHER,   //!< その他のパケット
+  PL_PACKET_TYPE_OTHER    //!< その他のパケット
 } PL_PACKET_TYPE;
 
 /**