Commit e15a1bbb authored by Raphael Defosseux's avatar Raphael Defosseux

Merge branch 'ci-try-outs' into 'develop'

MR proper merge nb2

See merge request !12
parents 6a5ad846 dbcf0835
Pipeline #8865 passed with stage
in 0 seconds
......@@ -2,7 +2,7 @@
if [ $# -eq 0 ]
then
NB_FILES_TO_FORMAT=`astyle --dry-run --options=scripts/astyle-options.txt src/*.* | grep -c Formatted `
NB_FILES_TO_FORMAT=`astyle --dry-run --options=scripts/astyle-options.txt --recursive *.c *.h | grep -c Formatted `
echo "Nb Files that do NOT follow OAI rules: $NB_FILES_TO_FORMAT"
exit 0
fi
......@@ -11,8 +11,8 @@ if [ $# -eq 2 ]
then
# Merge request scenario
INIT_COMMIT=$1
echo "Initial Commit is : $INIT_COMMIT"
SOURCE_BRANCH=$1
echo "Source Branch is : $SOURCE_BRANCH"
TARGET_BRANCH=$2
echo "Target Branch is : $TARGET_BRANCH"
......@@ -45,7 +45,7 @@ fi
if [ $# -ne 0 ] || [ $# -ne 2 ]
then
echo "Syntax error: $0 without any option will check all files in repository"
echo " or: $0 feature-branch-commit-id target-branch"
echo " or: $0 source-branch target-branch"
echo " will only check files that are pushed for a merge-request"
exit 1
fi
......@@ -3,16 +3,14 @@
* Author Raphael Defosseux
* Comments : Proper comments
*/
#include <stdio.h>
int main()
{
int testId = 2;
/*
* proper signed int usage
*/
printf ("Test #%d\n", testId);
#include <stdio.h>
return 0;
int main() {
int testId = 2;
/*
* Proper Signed int usage
*/
printf ("Test #%d\n", testId);
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment