Skip to content

Commit

Permalink
fix cppcheck failure (#1)
Browse files Browse the repository at this point in the history
* fix cppcheck failure

* fix build script not running and credentials could not be fetched

* restore configure-aws-credentials to v2

* add execute permission for shell scripts

* remove bash for mac build scripts

* trigger all tests
  • Loading branch information
RoyZhang2022 authored and alinaliBQ committed Dec 7, 2023
1 parent 3e7055e commit 657f5e6
Show file tree
Hide file tree
Showing 21 changed files with 29 additions and 3 deletions.
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_debug32_deb.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_debug64_deb.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_release32_deb.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_release32_rpm.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_release64_deb.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
2 changes: 2 additions & 0 deletions amazon-timestream-odbc-driver/build_linux_release64_rpm.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

# Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
Expand Down
1 change: 0 additions & 1 deletion amazon-timestream-odbc-driver/build_mac_debug64.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,3 @@ if [ $RET_CODE -ne 0 ]; then
fi

cd ..

Empty file modified amazon-timestream-odbc-driver/build_mac_release64.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/build_performance_linux64.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/build_performance_mac64.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion amazon-timestream-odbc-driver/run_cppcheck.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# --force: force checks all define combinations (default max is 12)
# --suppress=objectIndex: seemingly false-positive

cppcheck --force --library=boost --library=documentdb .\src\ 2> .\cppcheck-results.log
cppcheck --force --library=boost --library=timestream .\src\ 2> .\cppcheck-results.log
If ((Get-Content "cppcheck-results.log") -eq $Null) {
exit 0
}
Expand Down
2 changes: 1 addition & 1 deletion amazon-timestream-odbc-driver/run_cppcheck.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RESULTS_FILE=cppcheck-results.log

# --force: force checks all define combinations (default max is 12)
# -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo
cppcheck --force --library=boost --library=documentdb -UWIN32 ./src/ 2> ${RESULTS_FILE}
cppcheck --force --library=boost --library=timestream -UWIN32 ./src/ 2> ${RESULTS_FILE}

if [ -s ${RESULTS_FILE} ]; then
echo "!! Cppcheck errors found! Check ${RESULTS_FILE} for details."
Expand Down
Empty file modified amazon-timestream-odbc-driver/run_test_runner.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/scripts/build_linux.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/scripts/env_variables_check.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/scripts/postinst_unix.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/scripts/register_driver_unix.sh
100644 → 100755
Empty file.
Empty file modified amazon-timestream-odbc-driver/scripts/unix_check_changes.sh
100644 → 100755
Empty file.
11 changes: 11 additions & 0 deletions amazon-timestream-odbc-driver/timestream.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<def format="2">
<!-- Boost Library Configuration -->
<!-- Documentation: https://www.boost.org/doc/libs/ -->
<!-- ########## Boost defines / macros ########## -->
<define name="IGNITE_BINARY_TYPE_START(T)" value=""/>
<define name="IGNITE_BINARY_GET_TYPE_NAME_AS_IS(typeName)" value=""/>
<define name="IGNITE_BINARY_GET_FIELD_ID_AS_HASH" value=""/>
<define name="IGNITE_BINARY_IS_NULL_FALSE(T)" value=""/>
<define name="IGNITE_BINARY_GET_NULL_DEFAULT_CTOR(T)" value=""/>
</def>

0 comments on commit 657f5e6

Please sign in to comment.