Revert "SONARPY-975 Generate typeshed protobuf messages in cirrus-ci only when needed (#1074)"

This reverts commit 2e9b52d.

Author: andreaguarino

.cirrus.yml

@@ -33,31 +33,7 @@ win_vm_definition: &WINDOWS_VM_DEFINITION
     type: n1-standard-8
     use_ssd: true
 
-generate_typeshed_task:
-  gke_container:
-    dockerfile: .cirrus/python-env.Dockerfile
-    builder_image_project: language-team
-    builder_image_name: docker-builder-lt-v1
-    cluster_name: cirrus-ci-lt-cluster
-    zone: us-central1-a
-    namespace: default
-    cpu: 2
-    memory: 2G
-  skip: "!changesInclude('python-frontend/typeshed_serializer/**', 'python-frontend/src/protobuf/symbols.proto')"
-  env:
-    GITHUB_TOKEN: ENCRYPTED[!f458126aa9ed2ac526f220c5acb51dd9cc255726b34761a56fc78d4294c11089502a882888cef0ca7dd4085e72e611a5!]
-  maven_cache:
-    folder: ${CIRRUS_WORKING_DIR}/.m2/repository
-  build_script:
-    - git submodule update --init
-    - source cirrus-env BUILD
-    - cd python-frontend
-    - mvn clean install -DgenerateTypeshed
-  cleanup_before_cache_script: cleanup_maven_repository
-
 build_task:
-  depends_on:
-    - generate_typeshed
   gke_container:
     dockerfile: .cirrus/python-env.Dockerfile
     builder_image_project: language-team
@@ -94,7 +70,7 @@ build_win_task:
     folder: ~/.m2/repository
   build_script:
     - git submodule update --init
-    - mvn.cmd -s /c/buildTools-docker/settings-public.xml test
+    - mvn.cmd -s /c/buildTools-docker/settings-public.xml test -DskipTypeshed=true
   cleanup_before_cache_script: cleanup_maven_repository
 
 ws_scan_task:
@@ -113,7 +89,7 @@ ws_scan_task:
   whitesource_script:
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
-    - mvn clean install -DskipTests -Denforcer.skip=true -Dskip.its=true
+    - mvn clean install -DskipTests -DskipTypeshed -Denforcer.skip=true -Dskip.its=true
     - source ws_scan.sh
   allow_failures: "true"
   always:

README.md

@@ -19,8 +19,9 @@ In order for it to work properly it needs to have Python runtime and [Typeshed](
 
 ### Profiles
 
-- `mvn clean install` : avoid running [typeshed_serializer](https://github.com/SonarSource/sonar-python/tree/master/python-frontend/typeshed_serializer) tests and build only Java maven modules
-- `mvn clean install -DgenerateTypeshed`: execute full build, run tests for [typeshed_serializer](https://github.com/SonarSource/sonar-python/tree/master/python-frontend/typeshed_serializer)
+- `mvn clean install` : execute full build, run tests for [typeshed_serializer](https://github.com/SonarSource/sonar-python/tree/master/python-frontend/typeshed_serializer)
+- `mvn clean install -DskipTypeshed`: avoid running [typeshed_serializer](https://github.com/SonarSource/sonar-python/tree/master/python-frontend/typeshed_serializer) tests and build only Java maven modules
+
 ## License
 
 Copyright 2011-2022 SonarSource.

python-frontend/pom.xml

@@ -130,7 +130,7 @@
       <activation>
         <property>
           <name>
-            generateTypeshed
+            !skipTypeshed
           </name>
         </property>
       </activation>