Merge branch '3.0.x'

.github/workflows/composites/clean-space/action.yaml

@@ -3,10 +3,33 @@ description: clean space
 runs:
   using: "composite"
   steps:
-    - name: apt-update
+
+    ### this is supposed to be simpler, but it's a work-around for:
+    ### https://github.com/jlumbroso/free-disk-space/issues/14
+
+    - name: manually remove gcloud
       shell: bash
       run: |
-        sudo apt-get update
+        gcloud_sdk_root=$(gcloud info --format='value(installation.sdk_root)')
+        gcloud_global_config=$(gcloud info --format='value(config.paths.global_config_dir)')
+        
+        echo "will remove directory : $gcloud_sdk_root"
+        echo "will remove directory : $gcloud_global_config"
+        
+        sudo rm -fr $gcloud_sdk_root
+        sudo rm -fr $gcloud_global_config
+
+    - name: same as 'large-packages' but without 'google-cloud-sdk'
+      shell: bash
+      run: | 
+        sudo apt-get remove -y '^dotnet-.*'
+        sudo apt-get remove -y '^llvm-.*'
+        sudo apt-get remove -y 'php.*'
+        sudo apt-get remove -y '^mongodb-.*'
+        sudo apt-get remove -y '^mysql-.*'
+        sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+        sudo apt-get autoremove -y
+        sudo apt-get clean
 
     - name: Free Disk Space
       uses: jlumbroso/free-disk-space@main
@@ -15,5 +38,5 @@ runs:
         android: true
         dotnet: true
         haskell: true
-        large-packages: true
+        large-packages: false
         swap-storage: true

.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml

@@ -61,7 +61,7 @@ runs:
            ./mvnw -s .settings.xml \
            -DtestsToRun=${TEST_ARG[@]} \
            -e clean install \
-           -U -P sonar -nsu --batch-mode \
+           -P 'sonar, run-on-github-actions'  -nsu --batch-mode \
            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
            -Dhttp.keepAlive=false \
            -Dmaven.wagon.http.pool=false \

.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml

@@ -150,7 +150,7 @@ runs:
         ./mvnw -s .settings.xml \
               -DtestsToRun=${tests_to_run_in_current_index} \
               -e clean install \
-              -U -P sonar -nsu --batch-mode \
+              -P 'sonar, run-on-github-actions' -nsu --batch-mode \
               -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
               -Dhttp.keepAlive=false \
               -Dmaven.wagon.http.pool=false \

.github/workflows/composites/save-controller-images/action.yaml

@@ -1,15 +0,0 @@
-name: save controller docker images
-description: save controller docker images
-runs:
-  using: "composite"
-  steps:
-    - name: save controller docker images
-      shell: bash
-      run: |
-        mkdir -p /tmp/docker/images
-        TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
-        cd spring-cloud-kubernetes-controllers
-        while read controller_image; do
-          docker save -o /tmp/docker/images/${controller_image}.tar docker.io/springcloud/${controller_image}:$TAG
-        done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q | grep -v 'spring-cloud-kubernetes-controllers')
-        cd ..

.github/workflows/composites/save-integration-tests-images/action.yaml

@@ -1,20 +0,0 @@
-name: save integration tests docker images
-description: save integration tests docker images
-runs:
-  using: "composite"
-  steps:
-    - name: save integration tests docker images
-      shell: bash
-      run: |
-        mkdir -p /tmp/docker/images
-        TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
-        cd spring-cloud-kubernetes-integration-tests
-        while read integ_test; do
-          docker save -o /tmp/docker/images/${integ_test}.tar docker.io/springcloud/${integ_test}:$TAG
-        done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q \
-                        | grep -v 'spring-cloud-kubernetes-integration-tests' \
-                        | grep -v 'spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps' \
-                        | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app' \
-                        | grep -v 'spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps' \
-                        | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app' )
-        cd ..

.github/workflows/maven.yaml

@@ -29,9 +29,6 @@ jobs:
       - name: checkout project
         uses: actions/checkout@v2
 
-      - name: clean space
-        uses: ./.github/workflows/composites/clean-space
-
       - name: set env variables
         uses: ./.github/workflows/composites/env-variables