ci: improve e2e check

Author: shanye997

.github/workflows/e2e.yml

@@ -4,10 +4,10 @@ on:
     branches:
       - master
       - main
-    types: [ 'opened', 'synchronize' ]
+    types: ["opened", "synchronize"]
     paths:
-      - 'quickstarts/**'
-      - 'solution/**'
+      - "quickstarts/**/**.tf"
+      - "solution/**/**.tf"
 
 jobs:
   terraform-fmt:
@@ -21,7 +21,6 @@ jobs:
           terraform -chdir=quickstarts fmt -check -recursive
           terraform -chdir=solution fmt -check -recursive
 
-
   terraform-validate:
     runs-on: ubuntu-latest
     steps:
@@ -34,8 +33,7 @@ jobs:
           dir_names: "true"
           separator: ","
           files: |
-            quickstarts/*
-            solution/*
+            {quickstarts,solution}/**/*.tf
           dir_names_max_depth: 3
       - name: Terraform validate
         run: |
@@ -58,21 +56,13 @@ jobs:
             fi
           done
 
-
   e2e-check:
     needs: [terraform-fmt, terraform-validate]
     runs-on: ubuntu-latest
     name: e2e check
     steps:
       - name: checkout
         uses: actions/checkout@v3
-      - name: Checking the max commits number
-        run: |
-          commitNum=${{ github.event.pull_request.commits }}
-          if [[ ${commitNum} -gt 1 ]]; then
-            echo -e "\nERROR: The PR has ${commitNum} commits, and please rebase it to 1.\n"
-            exit 1
-          fi
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v34
@@ -82,14 +72,17 @@ jobs:
           files: |
             quickstarts/*
             solution/*
+          files_ignore: |
+            quickstarts/**/**.md
+            solution/**/**.md
           dir_names_max_depth: 3
       - name: set id
         id: set-job-id
         uses: ayachensiyuan/[email protected]
-        env: 
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          job-name: 'e2e check'   
+          job-name: "e2e check"
       - name: get pull request info
         run: |
           echo "repo name is" ${{github.event.pull_request.head.repo.full_name}}
@@ -104,4 +97,4 @@ jobs:
           fi
           objectPath="github-action/${{github.repository}}/e2e/Action-${{github.run_number}}-${{github.run_id}}-${{ steps.set-job-id.outputs.jobId }}"
           curl -H "X-Fc-Invocation-Type:Async" -s https://example-ci-terrafoodule-ci-svrrwvrpnj.ap-southeast-1.fcapp.run/?branch=${{github.event.pull_request.head.ref}}\&repo_name=${{github.event.pull_request.head.repo.full_name}}\&oss_object_path=${objectPath}
-          go run scripts/e2e_check.go ${objectPath}
+          go run scripts/e2e_check.go ${objectPath}

.github/workflows/pull_request.yml

@@ -0,0 +1,25 @@
+name: Pull Request
+on:
+  pull_request:
+    branches:
+      - master
+      - main
+    types: ["opened", "synchronize"]
+    paths:
+      - "quickstarts/**"
+      - "solution/**"
+
+jobs:
+  commit-check:
+    runs-on: ubuntu-latest
+    name: commit check
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Checking the max commits number
+        run: |
+          commitNum=${{ github.event.pull_request.commits }}
+          if [[ ${commitNum} -gt 1 ]]; then
+            echo -e "\nERROR: The PR has ${commitNum} commits, and please rebase it to 1.\n"
+            exit 1
+          fi

quickstarts/VPC/101-vswitch-docs-Example-01/main.tf

@@ -11,5 +11,5 @@ resource "alicloud_vswitch" "foo" {
   vswitch_name = "terraform-example"
   cidr_block   = "172.16.0.0/21"
   vpc_id       = alicloud_vpc.foo.id
-  zone_id      = data.alicloud_zones.foo.zones.0.id
+  zone_id       = data.alicloud_zones.foo.zones.0.id
 }

quickstarts/VPC/101-vswitch-docs-Example-02/README.md

@@ -25,4 +25,5 @@ No modules.
 ## Inputs
 
 No inputs.
+
 <!-- END_TF_DOCS -->