#25320: Changing test results branch creation model for master/relea…

…se and the rest
dotCMS · Jun 22, 2023 · 656e828 · 656e828
1 parent 5515066
commit 656e828
Show file tree

Hide file tree

Showing 13 changed files with 180 additions and 823 deletions.
diff --git a/.github/actions/build-core/dist/index.js b/.github/actions/build-core/dist/index.js
@@ -56,8 +56,12 @@ const COMMANDS = {
         },
         {
             cmd: gradleCmd,
-            args: ['createDistPrep'],
+            args: ['createDistPrep', '--stacktrace'],
             workingDir: dotCmsRoot
+        },
+        {
+            cmd: 'rm',
+            args: ['-rf', '/home/runner/.m2/repository/com/dotcms']
         }
     ],
     maven: [
@@ -3583,4 +3587,4 @@ module.exports = require("util");
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
+;
diff --git a/.github/actions/build-core/src/core-builder.ts b/.github/actions/build-core/src/core-builder.ts
@@ -28,6 +28,10 @@ const COMMANDS: Commands = {
       cmd: gradleCmd,
       args: ['createDistPrep', '--stacktrace'],
       workingDir: dotCmsRoot
+    },
+    {
+      cmd: 'rm',
+      args: ['-rf', '/home/runner/.m2/repository/com/dotcms']
     }
   ],
   maven: [

diff --git a/.github/actions/cache-core/action.yml b/.github/actions/cache-core/action.yml
@@ -7,8 +7,8 @@ inputs:
     description: 'Build environment to use'
     type: choice
     options:
-    - gradle
-    - maven
+      - gradle
+      - maven
     required: true
   cache_locations:
     description: 'Locations to cache'
@@ -19,7 +19,7 @@ inputs:
     default: |
             {
               "gradle": {
-                "dependencies": "${{ runner.os }}-gradle-dependencies-${{ hashFiles('**/build.gradle', '**/dependencies.gradle', '**/deploy.gradle', '**/immutables.gradle', '**/settings.gradle', '**/gradle.properties', '**/gradle-wrapper.properties', '**/core-cicd-tests.yml') }}",
+                "dependencies": "${{ runner.os }}-gradle-dependencies-${{ hashFiles('**/build.gradle', '**/dependencies.gradle', '**/settings.gradle', '**/gradle.properties', '**/gradle-wrapper.properties', '**/core-cicd-tests.yml') }}",
                 "buildOutput": "${{ runner.os }}-gradle-build-output-${{ github.SHA }}"
               },
               "maven": {

diff --git a/.github/actions/core-cache-locator/dist/index.js b/.github/actions/core-cache-locator/dist/index.js
@@ -41,13 +41,17 @@ const PROJECT_ROOT = core.getInput('project_root');
 const DOTCMS_ROOT = path.join(PROJECT_ROOT, 'dotCMS');
 const CACHE_CONFIGURATION = {
     gradle: {
-        dependencies: [path.join(GRADLE_FOLDER, 'caches'), path.join(GRADLE_FOLDER, 'wrapper')],
+        dependencies: [
+            path.join(GRADLE_FOLDER, 'caches'),
+            path.join(GRADLE_FOLDER, 'wrapper'),
+            path.join(M2_FOLDER, 'repository')
+        ],
         buildOutput: [
             path.join(DOTCMS_ROOT, '.gradle'),
+            path.join(DOTCMS_ROOT, 'gradle'),
             path.join(DOTCMS_ROOT, 'build', 'classes'),
             path.join(DOTCMS_ROOT, 'build', 'generated'),
-            path.join(DOTCMS_ROOT, 'build', 'resources'),
-            path.join(PROJECT_ROOT, 'dist', 'dotserver')
+            path.join(DOTCMS_ROOT, 'build', 'resources')
         ]
     },
     maven: {

diff --git a/.github/actions/core-cache-locator/src/cache-locator.ts b/.github/actions/core-cache-locator/src/cache-locator.ts
@@ -19,14 +19,17 @@ const PROJECT_ROOT = core.getInput('project_root')
 const DOTCMS_ROOT = path.join(PROJECT_ROOT, 'dotCMS')
 const CACHE_CONFIGURATION: CacheConfiguration = {
   gradle: {
-    dependencies: [path.join(GRADLE_FOLDER, 'caches'), path.join(GRADLE_FOLDER, 'wrapper')],
+    dependencies: [
+      path.join(GRADLE_FOLDER, 'caches'),
+      path.join(GRADLE_FOLDER, 'wrapper'),
+      path.join(M2_FOLDER, 'repository')
+    ],
     buildOutput: [
       path.join(DOTCMS_ROOT, '.gradle'),
       path.join(DOTCMS_ROOT, 'gradle'),
       path.join(DOTCMS_ROOT, 'build', 'classes'),
       path.join(DOTCMS_ROOT, 'build', 'generated'),
-      path.join(DOTCMS_ROOT, 'build', 'resources'),
-      path.join(PROJECT_ROOT, 'dist', 'dotserver')
+      path.join(DOTCMS_ROOT, 'build', 'resources')
     ]
   },
   maven: {

diff --git a/.github/actions/publish-test-results/build-src/entrypoint.sh b/.github/actions/publish-test-results/build-src/entrypoint.sh
@@ -13,10 +13,8 @@ case "${INPUT_PARTIAL}" in
     ;;
   close)
     closeResults
-    rc=$?
     setOutputs
     printStatus
-    exit $rc
     ;;
   *)
     copyResults