Skip to content

Commit

Permalink
[type:fix] fix docker ci error (apache#5702)
Browse files Browse the repository at this point in the history
* [type:fix] fix docker ci error

* [type:fix] fix docker ci error
  • Loading branch information
Aias00 authored Oct 13, 2024
1 parent cb0373b commit 9b764c2
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
if: steps.filter.outputs.changed == 'true'
with:
java-version: ${{ matrix.java }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
22 changes: 15 additions & 7 deletions .github/workflows/e2e-k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
- uses: dorny/paths-filter@v2
Expand All @@ -55,12 +57,14 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
- name: Set up JDK 17 for Building ShenYu
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down Expand Up @@ -124,7 +128,9 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
rm -rf /tmp/shenyu
Expand All @@ -145,7 +151,7 @@ jobs:
cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
- name: Set up JDK 17 for Building ShenYu
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down Expand Up @@ -216,7 +222,9 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
rm -rf /tmp/shenyu
Expand All @@ -237,7 +245,7 @@ jobs:
cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
- name: Set up JDK 17 for Building ShenYu
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrated-test-k8s-ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
if: steps.filter.outputs.changed == 'true'
with:
java-version: 17
Expand All @@ -90,7 +90,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
if: steps.filter.outputs.changed == 'true'
with:
java-version: 17
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/integrated-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
- uses: dorny/paths-filter@v2
Expand All @@ -66,7 +68,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
if: steps.filter.outputs.changed == 'true'
with:
java-version: 17
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/k8s-examples-http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
run: |
df --human-readable
sudo apt clean
docker rmi $(docker image ls --all --quiet)
for image in $(docker image ls --all --quiet); do
docker rmi $image
done
rm --recursive --force "$AGENT_TOOLSDIRECTORY"
df --human-readable
-
Expand All @@ -61,7 +63,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
-
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: steps.filter.outputs.changed == 'true'
with:
java-version: 17
Expand Down

0 comments on commit 9b764c2

Please sign in to comment.