Skip to content

Commit

Permalink
various pipeline improvements (#1454)
Browse files Browse the repository at this point in the history
  • Loading branch information
wind57 authored Sep 28, 2023
1 parent 95c181b commit c88c9fa
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 45 deletions.
29 changes: 26 additions & 3 deletions .github/workflows/composites/clean-space/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -15,5 +38,5 @@ runs:
android: true
dotnet: true
haskell: true
large-packages: true
large-packages: false
swap-storage: true
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/composites/save-controller-images/action.yaml

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
<version>3.1.2</version>
</plugin>
</plugins>
</build>
Expand Down
24 changes: 24 additions & 0 deletions spring-cloud-kubernetes-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,32 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>run-on-github-actions</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down

0 comments on commit c88c9fa

Please sign in to comment.