Optimize PR CI by deduplicating heavy workflow setup

.github/workflows/ci.yml

@@ -15,6 +15,10 @@
 
 name: ci
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
   push:

.github/workflows/codeql-analysis.yml

@@ -15,6 +15,10 @@
 
 name: "CodeQL"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches:

.github/workflows/e2e-k8s.yml

@@ -15,6 +15,10 @@
 
 name: e2e
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
   push:
@@ -30,15 +34,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Free disk space
-        run: |
-          df --human-readable
-          sudo apt clean
-          for image in $(docker image ls --all --quiet); do
-            docker rmi $image
-          done
-          rm --recursive --force "$AGENT_TOOLSDIRECTORY"
-          df --human-readable
+
       - uses: ./actions/paths-filter
         id: filter
         with:
@@ -62,12 +58,13 @@ jobs:
 
   build-docker-images:
     needs: changes
-    if: ${{ needs.changes.outputs.e2e == 'true' }}
+    if: github.repository == 'apache/shenyu' && needs.changes.outputs.e2e == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
+
       - name: Free disk space
         run: |
           df --human-readable
@@ -84,25 +81,25 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
+      - name: Restore ShenYu Maven Repos
+        id: restore-maven-cache
+        uses: actions/cache/restore@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
       - 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
+          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
 
       - name: Build with Maven
         shell: bash
@@ -112,48 +109,66 @@ jobs:
             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
+            ./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
+
+      - name: Build examples with Maven
+        shell: bash
+        run: |
+          if mvnd --version > /dev/null 2>&1; then
+            echo "Using mvnd for build examples"
+            mvnd -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml
+          else
+            echo "Falling back to maven wrapper for examples"
+            ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml
           fi
 
       - name: Save ShenYu Maven Repos
+        if: steps.restore-maven-cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
-      #      - name: Build shenyu-e2e-engine with Maven
-      #        run: ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-engine -am clean install
-
-      #      - name: Save ShenYu E2E Maven Repos
-      #        if: steps.restore-e2e-maven-cache.outputs.cache-hit != 'true'
-      #        uses: actions/cache/save@v3
-      #        with:
-      #          path: ~/.m2/repository
-      #          key: ${{ runner.os }}-e2e-maven-${{ hashFiles('**/pom.xml') }}
+      - name: Export base images
+        run: |
+          docker save \
+            apache/shenyu-bootstrap:latest \
+            apache/shenyu-admin:latest \
+            > /tmp/shenyu-base-images.tar
 
-      - name: Build Docker Image
+      - name: Export example images
         run: |
-          docker save apache/shenyu-bootstrap:latest > /tmp/apache-shenyu-bootstrap.tar
-          docker save apache/shenyu-admin:latest > /tmp/apache-shenyu-admin.tar
+          docker save \
+            shenyu-examples-http:latest \
+            shenyu-examples-eureka:latest \
+            shenyu-examples-springcloud:latest \
+            shenyu-examples-apache-dubbo-service:latest \
+            shenyu-examples-sofa:latest \
+            shenyu-examples-grpc:latest \
+            shenyu-example-spring-native-websocket:latest \
+            > /tmp/shenyu-e2e-example-images.tar
+
+      - name: Upload base image artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: shenyu-base-images
+          path: /tmp/shenyu-base-images.tar
+          retention-days: 1
 
-      - name: Upload Docker Image Artifacts
+      - name: Upload example image artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: shenyu-images
-          path: /tmp/apache-shenyu-*.tar
+          name: shenyu-e2e-example-images
+          path: /tmp/shenyu-e2e-example-images.tar
           retention-days: 1
 
   e2e-storage:
     runs-on: ubuntu-latest
     needs:
       - changes
       - build-docker-images
-    if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }})
-    #    if: (github.repository == 'apache/shenyu')
+    if: github.repository == 'apache/shenyu' && needs.changes.outputs.e2e == 'true'
     strategy:
       matrix:
         include:
@@ -182,14 +197,6 @@ jobs:
           rm -rf /tmp/shenyu
           mkdir -p /tmp/shenyu
 
-      #      - name: Install k8s
-      #        if: steps.filter.outputs.changed == 'true'
-      #        run: |
-      #          curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.6+k3s2 K3S_KUBECONFIG_MODE=777 sh -
-      #          cat /etc/rancher/k3s/k3s.yaml
-      #          mkdir -p ~/.kube
-      #          cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
-
       - name: Set up JDK 17 for Building ShenYu
         uses: actions/setup-java@v4
         with:
@@ -206,38 +213,24 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: shenyu-images
+          name: shenyu-base-images
           path: /tmp/shenyu/
 
       - name: Load ShenYu Docker Images
         run: |
-          docker load --input /tmp/shenyu/apache-shenyu-admin.tar
-          docker load --input /tmp/shenyu/apache-shenyu-bootstrap.tar
+          docker load --input /tmp/shenyu/shenyu-base-images.tar
           docker image ls -a
 
-      #      - name: Build k8s Cluster
-      #        if: steps.filter.outputs.changed == 'true'
-      #        run: |
-      #          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-admin.tar
-      #          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-bootstrap.tar
-
       - name: Run E2E Tests
         run: |
           bash ./shenyu-e2e/shenyu-e2e-case/${{ matrix.case }}/compose/script/${{ matrix.script }}.sh
 
-  #      - name: Cluster Test after Healthcheck
-  #        if: steps.filter.outputs.changed == 'true'
-  #        run: |
-  #          kubectl get all
-  #          kubectl get events --all-namespaces
-
   e2e-case:
     runs-on: ubuntu-latest
     needs:
       - changes
       - build-docker-images
-    if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }})
-    #    if: (github.repository == 'apache/shenyu')
+    if: github.repository == 'apache/shenyu' && needs.changes.outputs.e2e == 'true'
     strategy:
       matrix:
         include:
@@ -261,7 +254,6 @@ jobs:
             script: e2e-logging-rocketmq-compose
           # - case: shenyu-e2e-case-logging-kafka
           #   script: e2e-logging-kafka-compose
-
     steps:
       - uses: actions/checkout@v2
         with:
@@ -279,14 +271,6 @@ jobs:
           rm -rf /tmp/shenyu
           mkdir -p /tmp/shenyu
 
-      #      - name: Install k8s
-      #        if: steps.filter.outputs.changed == 'true'
-      #        run: |
-      #          curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.6+k3s2 K3S_KUBECONFIG_MODE=777 sh -
-      #          cat /etc/rancher/k3s/k3s.yaml
-      #          mkdir -p ~/.kube
-      #          cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
-
       - name: Set up JDK 17 for Building ShenYu
         uses: actions/setup-java@v4
         with:
@@ -301,82 +285,26 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - 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
-
       - uses: actions/download-artifact@v4
         with:
-          name: shenyu-images
+          name: shenyu-base-images
           path: /tmp/shenyu/
 
-      #      - name: Restore ShenYu E2E Maven Repos
-      #        uses: actions/cache/restore@v3
-      #        with:
-      #          path: ~/.m2/repository
-      #          key: ${{ runner.os }}-e2e-maven-${{ hashFiles('**/pom.xml') }}
-      #          restore-keys: |
-      #            ${{ runner.os }}-e2e-maven-
-
-      - name: Build examples with Maven
-        shell: bash
-        run: |
-          echo "Falling back to maven wrapper for examples"
-          if [[ "${{ runner.os }}" == "Windows" ]]; then
-            ./mvnw.cmd -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml
-          else
-            ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml
-          fi
-
       - uses: actions/download-artifact@v4
         with:
-          name: shenyu-images
+          name: shenyu-e2e-example-images
           path: /tmp/shenyu/
 
       - name: Load ShenYu Docker Images
         run: |
-          docker load --input /tmp/shenyu/apache-shenyu-admin.tar
-          docker load --input /tmp/shenyu/apache-shenyu-bootstrap.tar
+          docker load --input /tmp/shenyu/shenyu-base-images.tar
+          docker load --input /tmp/shenyu/shenyu-e2e-example-images.tar
           docker image ls -a
 
-      #      - name: Build k8s Cluster
-      #        if: steps.filter.outputs.changed == 'true'
-      #        run: |
-      #          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-admin.tar
-      #          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-bootstrap.tar
-
-      #      - name: Setup Debug Session
-      #        uses: mxschmitt/action-tmate@v3
-      #        timeout-minutes: 15
-      #        with:
-      #          detached: true
-
       - name: Run E2E Tests
         run: |
           bash ./shenyu-e2e/shenyu-e2e-case/${{ matrix.case }}/compose/script/${{ matrix.script }}.sh
 
-  #      - name: Cluster Test after Healthcheck
-  #        if: steps.filter.outputs.changed == 'true'
-  #        run: |
-  #          kubectl get all
-  #          kubectl get events --all-namespaces
-
   requirement:
     name: e2e
     if: ${{ needs.changes.outputs.e2e == 'true' }}