From 4b87617f83e11f1b90f675de7bfa02224655e250 Mon Sep 17 00:00:00 2001 From: "ivan@edmi.nl" <060599IJh> Date: Tue, 6 Jul 2021 14:07:46 +0200 Subject: [PATCH 1/8] add .git to sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 6fb862bde5..19ba2d1379 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectVersion=1.0 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. -sonar.sources=src,viper/src,hre/src,col/src,build.sbt,viper/build.sbt,hre/build.sbt,col/build.sbt +sonar.sources=src,viper/src,hre/src,col/src,build.sbt,viper/build.sbt,hre/build.sbt,col/build.sbt,.git sonar.java.binaries=target,viper/target,hre/target,col/target sonar.exclusions=src/main/universal/**/* From de3957bad8c5a2493fc309083e3ec8d45061ef2e Mon Sep 17 00:00:00 2001 From: "ivan@edmi.nl" <060599IJh> Date: Wed, 7 Jul 2021 09:42:41 +0200 Subject: [PATCH 2/8] test sonarcub --- col/src/main/java/test.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 col/src/main/java/test.java diff --git a/col/src/main/java/test.java b/col/src/main/java/test.java new file mode 100644 index 0000000000..4556301cfb --- /dev/null +++ b/col/src/main/java/test.java @@ -0,0 +1,4 @@ +public class test { + public int i = 3; + +} From 8b30a78c7e1e515bbe617b4b93412e3425f1acd6 Mon Sep 17 00:00:00 2001 From: Ivan Hop Date: Wed, 7 Jul 2021 10:11:44 +0200 Subject: [PATCH 3/8] Update README.md testsonar --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a93dbf3a13..42258ca99e 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,4 @@ Copyright (c) 2008 - 2019 Formal Methods and Tools, University of Twente All rights reserved. The license to VerCors is a mozilla open source license as described in LICENSE.TXT in the root of this project. It is a free to use, share-alike license. Should this license be too restrictive for your purpose, please let us know by creating an issue in our bug tracker. Direct contributors (people who send us pull-requests or edit this repository directly) are expected to agree with any license that the University of Twente might decide. If you do not agree with future license changes, please instead fork this repository as allowed under the conditions of LICENSE.TXT. + From 3cab2017bb8fe245682337186f880537d2e3b92e Mon Sep 17 00:00:00 2001 From: "ivan@edmi.nl" <060599IJh> Date: Wed, 7 Jul 2021 11:43:18 +0200 Subject: [PATCH 4/8] changed sonar configuration --- sonar-project.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sonar-project.properties b/sonar-project.properties index 19ba2d1379..1b685b9f17 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,6 +5,9 @@ sonar.projectKey=utwente-fmt_vercors sonar.projectName=VerCors sonar.projectVersion=1.0 +sonar.scm.enabled=true +sonar.scm.provider=git + # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. sonar.sources=src,viper/src,hre/src,col/src,build.sbt,viper/build.sbt,hre/build.sbt,col/build.sbt,.git From 5c184d9a1464ae005370401e40b57d3481825dab Mon Sep 17 00:00:00 2001 From: "ivan@edmi.nl" <060599IJh> Date: Wed, 7 Jul 2021 11:55:48 +0200 Subject: [PATCH 5/8] disable shallow copy --- .github/workflows/build-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 5b3b4753df..132a70644a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -18,6 +18,8 @@ jobs: # running when for example new commits are pushed. - uses: technote-space/auto-cancel-redundant-workflow@v1 - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Cache SBT dependencies modules uses: actions/cache@v2 with: From ec2e8c91a3d823e07ba3b03a7bb0ac127ca07cc0 Mon Sep 17 00:00:00 2001 From: Ivan Hop Date: Wed, 7 Jul 2021 12:24:39 +0200 Subject: [PATCH 6/8] removed superfluous --- sonar-project.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 1b685b9f17..6fb862bde5 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,12 +5,9 @@ sonar.projectKey=utwente-fmt_vercors sonar.projectName=VerCors sonar.projectVersion=1.0 -sonar.scm.enabled=true -sonar.scm.provider=git - # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. -sonar.sources=src,viper/src,hre/src,col/src,build.sbt,viper/build.sbt,hre/build.sbt,col/build.sbt,.git +sonar.sources=src,viper/src,hre/src,col/src,build.sbt,viper/build.sbt,hre/build.sbt,col/build.sbt sonar.java.binaries=target,viper/target,hre/target,col/target sonar.exclusions=src/main/universal/**/* From 8dc857e76231d7f6737f4b4e5eabe980bb2dbbf2 Mon Sep 17 00:00:00 2001 From: Ivan Hop Date: Wed, 7 Jul 2021 12:34:05 +0200 Subject: [PATCH 7/8] remove test code --- col/src/main/java/test.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 col/src/main/java/test.java diff --git a/col/src/main/java/test.java b/col/src/main/java/test.java deleted file mode 100644 index 4556301cfb..0000000000 --- a/col/src/main/java/test.java +++ /dev/null @@ -1,4 +0,0 @@ -public class test { - public int i = 3; - -} From c30973424f4a8aa69f6acc2ecdfe26b9cb46e334 Mon Sep 17 00:00:00 2001 From: Ivan Hop Date: Wed, 7 Jul 2021 12:39:03 +0200 Subject: [PATCH 8/8] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 42258ca99e..a93dbf3a13 100644 --- a/README.md +++ b/README.md @@ -74,4 +74,3 @@ Copyright (c) 2008 - 2019 Formal Methods and Tools, University of Twente All rights reserved. The license to VerCors is a mozilla open source license as described in LICENSE.TXT in the root of this project. It is a free to use, share-alike license. Should this license be too restrictive for your purpose, please let us know by creating an issue in our bug tracker. Direct contributors (people who send us pull-requests or edit this repository directly) are expected to agree with any license that the University of Twente might decide. If you do not agree with future license changes, please instead fork this repository as allowed under the conditions of LICENSE.TXT. -