Skip to content

Commit

Permalink
Fixing Whitespace check bug in action.yml (#492)
Browse files Browse the repository at this point in the history
* Fixing a bug that is 2 years old in the ci.yml file related to exclude dirs
* Removing trailing spaces
---------
  • Loading branch information
Skptak authored Jul 17, 2023
1 parent 406415e commit deffbf8
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 25 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ jobs:
uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
with:
path: ./
exclude-dirs: |
docs
.github
exclude-dirs: docs,.github

git-secrets:
runs-on: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
- [#413](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/413) Clear timers in shutdown and suspend

### v3.3.0 (December 2021)
- Added CBMC proofs of all public and private functions in the OTA library.
- Added CBMC proofs of all public and private functions in the OTA library.
- [#373](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/373) Updated compiler flag for tinycbor source files
- [#407](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/407) Added checks to prevent arithmetic overflows
- [#390](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/390) Make OTA file type configurable.
- [#329](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/329) Misc fixes to remove build warnings
- [#329](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/329) Misc fixes to remove build warnings
- [#356](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/356) Add type cast to event functions as per POSIX spec

### v3.2.0 (November 2021)
- [#275](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/276) Updated the doxygen version from 1.8.20 to 1.9.2
- [#275](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/276) Updated the doxygen version from 1.8.20 to 1.9.2
- [#236](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/236) Added C++ guards
- [#231](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/231) Added checks for http interface functions.
- [#231](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/231) Added checks for http interface functions.

### v3.1.0 (August 2021)
- [#232](https://github.com/aws/ota-for-aws-iot-embedded-sdk/pull/232) Add updater version to the status details when job succeeds
Expand Down
2 changes: 1 addition & 1 deletion MISRA.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ _Ref 21.3.2_
#### Rule 21.8
_Ref 21.8.1_

- MISRA C-2012 Rule 21.8 Does not allow the use of some of the functions in stdlib.h. One of the OTA platform
- MISRA C-2012 Rule 21.8 Does not allow the use of some of the functions in stdlib.h. One of the OTA platform
abstraction layer interfaces `abort` is flagged for this violation. This is implemented by a platform
abstraction layer and always called through the OTA PAL interface.
2 changes: 1 addition & 1 deletion test/cbmc/proofs/OTA_Init/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ REMOVE_FUNCTION_BODY += __CPROVER_file_local_ota_c_initializeAppBuffers
REMOVE_FUNCTION_BODY += __CPROVER_file_local_ota_c_initializeLocalBuffers
REMOVE_FUNCTION_BODY += __CPROVER_file_local_ota_c_resetEventQueue

RESTRICT_FUNCTION_POINTER += OTA_Init.function_pointer_call.1/init
RESTRICT_FUNCTION_POINTER += OTA_Init.function_pointer_call.1/init

# If this proof is found to consume huge amounts of RAM, you can set the
# EXPENSIVE variable. With new enough versions of the proof tools, this will
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/OtaStopTimer_FreeRTOS/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PROJECT_SOURCES += $(SRCDIR)/source/portable/os/ota_os_freertos.c

NONDET_STATIC += "--nondet-static"

REMOVE_FUNCTION_BODIES +=
REMOVE_FUNCTION_BODIES +=
# If this proof is found to consume huge amounts of RAM, you can set the
# EXPENSIVE variable. With new enough versions of the proof tools, this will
# restrict the number of EXPENSIVE CBMC jobs running at once. See the
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/executeHandler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HARNESS_FILE = $(HARNESS_ENTRY)
PROOF_UID = executeHandler_harness

INCLUDES += -I$(SRCDIR)/source/dependency/coreJSON/source/include/
INCLUDES += -I$(SRCDIR)/test/cbmc/include
INCLUDES += -I$(SRCDIR)/test/cbmc/include

PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
PROJECT_SOURCES += $(SRCDIR)/source/ota.c
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/ingestDataBlock/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PROOF_UID = ingestDataBlock
DEFINES += -Dstatic=""

INCLUDES += -I$(SRCDIR)/source/dependency/coreJSON/source/include/
INCLUDES += -I$(SRCDIR)/test/cbmc/include
INCLUDES += -I$(SRCDIR)/test/cbmc/include

PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
PROOF_SOURCES += $(SRCDIR)/test/cbmc/source/stubs.c
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/otaClose/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PROOF_UID = otaClose
DEFINES += -Dstatic=""

INCLUDES += -I$(SRCDIR)/source/dependency/coreJSON/source/include/
INCLUDES += -I$(SRCDIR)/test/cbmc/include
INCLUDES += -I$(SRCDIR)/test/cbmc/include

PROOF_SOURCES += $(SRCDIR)/test/cbmc/source/stubs.c
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
Expand Down
8 changes: 4 additions & 4 deletions test/cbmc/proofs/processDataHandler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ REMOVE_FUNCTION_BODY += ingestDataBlock
REMOVE_FUNCTION_BODY += dataHandlerCleanup
REMOVE_FUNCTION_BODY += OTA_SignalEvent

RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.1/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.1/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.2/setImageState
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.3/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.4/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.5/start
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.3/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.4/updateStatus
RESTRICT_FUNCTION_POINTER += processDataHandler.function_pointer_call.5/start
RESTRICT_FUNCTION_POINTER += callOtaCallback.function_pointer_call.1/otaAppCallback

# If this proof is found to consume huge amounts of RAM, you can set the
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/requestJob_Mqtt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PROJECT_SOURCES += $(SRCDIR)/source/ota_mqtt.c
# into a buffer. This is much higher than the 84 characters of the buffer
# as null characters are used after the copied in strin to fill the buffer.
UNWINDSET += strncpy.0:220
# The strnlen function is used when calculating the maximum thingname length
# The strnlen function is used when calculating the maximum thingname length
# which can be used to generate the client token.
UNWINDSET += strnlen.0:54

Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/setImageStateWithReason/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PROOF_UID = setImageStateWithReason_harness
DEFINES += -Dstatic=""

INCLUDES += -I$(SRCDIR)/source/dependency/coreJSON/source/include/
INCLUDES += -I$(SRCDIR)/test/cbmc/include
INCLUDES += -I$(SRCDIR)/test/cbmc/include

PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c

Expand Down
4 changes: 2 additions & 2 deletions test/cbmc/proofs/startHandler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ PROJECT_SOURCES += $(SRCDIR)/source/ota.c

REMOVE_FUNCTION_BODY += OTA_SignalEvent

RESTRICT_FUNCTION_POINTER += platformInSelftest.function_pointer_call.1/getPlatformImageStateStub
RESTRICT_FUNCTION_POINTER += startHandler.function_pointer_call.1/startTimerStub
RESTRICT_FUNCTION_POINTER += platformInSelftest.function_pointer_call.1/getPlatformImageStateStub
RESTRICT_FUNCTION_POINTER += startHandler.function_pointer_call.1/startTimerStub

# If this proof is found to consume huge amounts of RAM, you can set the
# EXPENSIVE variable. With new enough versions of the proof tools, this will
Expand Down
4 changes: 2 additions & 2 deletions test/cbmc/proofs/verifyActiveJobStatus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ PROOF_UID = verifyActiveJobStatus
DEFINES += -Dstatic=""

INCLUDES += -I$(SRCDIR)/source/dependency/coreJSON/source/include/
INCLUDES += -I$(SRCDIR)/test/cbmc/include
INCLUDES += -I$(SRCDIR)/test/cbmc/include

PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
PROOF_SOURCES += $(SRCDIR)/test/cbmc/source/stubs.c
PROOF_SOURCES += $(SRCDIR)/test/cbmc/source/stubs.c

PROJECT_SOURCES += $(SRCDIR)/source/ota.c

Expand Down
2 changes: 1 addition & 1 deletion tools/lexicon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ jobstatusfailedwithval
jobstatusinprogress
jobstatusrejected
json
jsondoc
jsondoc
lastbyte
lastupdatedat
len
Expand Down

0 comments on commit deffbf8

Please sign in to comment.