Copilot commented on code in PR #6041:
URL: https://github.com/apache/shenyu/pull/6041#discussion_r2415957447
##########
.github/workflows/ci.yml:
##########
@@ -82,10 +82,48 @@ jobs:
if: steps.filter.outputs.code == 'true'
with:
java-version: ${{ matrix.java }}
- distribution: 'temurin'
+ distribution: "temurin"
+ - name: Install mvnd
+ if: steps.filter.outputs.code == 'true'
+ shell: bash
+ run: |
+ MVND_VERSION=1.0.2
+ if [[ "${{ runner.os }}" == "Windows" ]]; then
+ curl -sL
https://downloads.apache.org/maven/mvnd/${MVND_VERSION}/maven-mvnd-${MVND_VERSION}-windows-amd64.zip
-o mvnd.zip
+ unzip -q mvnd.zip
+ mkdir -p $HOME/.local
+ mv maven-mvnd-${MVND_VERSION}-windows-amd64 $HOME/.local/mvnd
+ echo "$HOME/.local/mvnd/bin" >> $GITHUB_PATH
+ echo "MVND_HOME=$HOME/.local/mvnd" >> $GITHUB_ENV
+ else
+ curl -sL
https://downloads.apache.org/maven/mvnd/${MVND_VERSION}/maven-mvnd-${MVND_VERSION}-linux-amd64.zip
-o mvnd.zip
+ unzip -q mvnd.zip
+ mkdir -p $HOME/.local
+ mv maven-mvnd-${MVND_VERSION}-linux-amd64 $HOME/.local/mvnd
+ echo "$HOME/.local/mvnd/bin" >> $GITHUB_PATH
+ echo "MVND_HOME=$HOME/.local/mvnd" >> $GITHUB_ENV
+ fi
+
+ - name: Verify mvnd installation
+ if: steps.filter.outputs.code == 'true'
+ shell: bash
+ run: mvnd --version || echo "mvnd version check failed, will use maven
wrapper as fallback"
Review Comment:
The verification step uses `|| echo` which always returns success, making
the step appear to pass even when mvnd fails. Consider using a proper error
handling approach or removing this step since the build steps already include
mvnd availability checks.
```suggestion
```
##########
.github/workflows/e2e-k8s.yml:
##########
@@ -81,29 +81,59 @@ jobs:
- name: Set up JDK 17 for Building ShenYu
uses: actions/setup-java@v4
with:
- java-version: '17'
- distribution: 'temurin'
+ java-version: "17"
+ distribution: "temurin"
+
+ - name: Install mvnd
+ shell: bash
+ run: |
+ MVND_VERSION=1.0.2
+ if [[ "${{ runner.os }}" == "Windows" ]]; then
+ curl -sL
https://downloads.apache.org/maven/mvnd/${MVND_VERSION}/maven-mvnd-${MVND_VERSION}-windows-amd64.zip
-o mvnd.zip
+ unzip -q mvnd.zip
+ mkdir -p $HOME/.local
+ mv maven-mvnd-${MVND_VERSION}-windows-amd64 $HOME/.local/mvnd
+ echo "$HOME/.local/mvnd/bin" >> $GITHUB_PATH
+ echo "MVND_HOME=$HOME/.local/mvnd" >> $GITHUB_ENV
+ else
+ curl -sL
https://downloads.apache.org/maven/mvnd/${MVND_VERSION}/maven-mvnd-${MVND_VERSION}-linux-amd64.zip
-o mvnd.zip
+ unzip -q mvnd.zip
+ mkdir -p $HOME/.local
+ mv maven-mvnd-${MVND_VERSION}-linux-amd64 $HOME/.local/mvnd
+ echo "$HOME/.local/mvnd/bin" >> $GITHUB_PATH
+ echo "MVND_HOME=$HOME/.local/mvnd" >> $GITHUB_ENV
+ fi
- name: Build with Maven
- run: ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -B -Drat.skip=true -Dmaven.test.skip=true
-Djacoco.skip=true -DskipITs -DskipTests package -T1C
+ shell: bash
+ run: |
+ if mvnd --version > /dev/null 2>&1; then
+ echo "Using mvnd for build"
+ mvnd -B clean install -Prelease,docker -Dmaven.javadoc.skip=true
-B -Drat.skip=true -Dmaven.test.skip=true -Djacoco.skip=true -DskipITs
-DskipTests package -T1C
+ else
+ echo "Falling back to maven wrapper"
+ if [[ "${{ runner.os }}" == "Windows" ]]; then
+ ./mvnw.cmd -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -B -Drat.skip=true -Dmaven.test.skip=true
-Djacoco.skip=true -DskipITs -DskipTests package -T1C
+ else
+ ./mvnw -B clean install -Prelease,docker
-Dmaven.javadoc.skip=true -B -Drat.skip=true -Dmaven.test.skip=true
-Djacoco.skip=true -DskipITs -DskipTests package -T1C
+ fi
+ fi
- name: Save ShenYu Maven Repos
uses: actions/cache/save@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Review Comment:
The `restore-keys` section was removed from the cache configuration. This
could impact cache efficiency as it won't fall back to partial matches when
exact cache key isn't found.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
