chore: release v1.7.0 (#1952) (#1955)

apache · Sep 13, 2023 · fc6404e · fc6404e
1 parent 7ecd088
commit fc6404e
Show file tree

Hide file tree

Showing 16 changed files with 330 additions and 14 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -46,3 +46,6 @@ github:
       v1.6.0:
         required_pull_request_reviews:
           required_approving_review_count: 1
+      1.7.0:
+        required_pull_request_reviews:
+          required_approving_review_count: 1
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ on:
     # The branches below must be a subset of the branches above
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
   schedule:
     - cron: '25 5 * * 5'
 

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -21,7 +21,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 
 permissions:

diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -25,7 +25,7 @@ on:
   push:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
 
 concurrency:
   group: ${{ github.workflow }}-dev

diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -24,7 +24,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     types: [ labeled, opened, synchronize, reopened, review_requested, ready_for_review ]
 
 concurrency:

diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 
 concurrency:

diff --git a/.github/workflows/goimports-reviser.yml b/.github/workflows/goimports-reviser.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   changes:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 
 jobs:

diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 
 jobs:

diff --git a/.github/workflows/lint-checker.yml b/.github/workflows/lint-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   changes:

diff --git a/.github/workflows/spell-checker.yml b/.github/workflows/spell-checker.yml
@@ -24,7 +24,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   misspell:

diff --git a/.github/workflows/unit-test-ci.yml b/.github/workflows/unit-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   changes:

diff --git a/.github/workflows/verify-codegen.yml b/.github/workflows/verify-codegen.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   changes:

diff --git a/.github/workflows/yamllint-checker.yml b/.github/workflows/yamllint-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - v1.6.0
+      - 1.7.0
     type: [review_requested, ready_for_review]
 jobs:
   changes:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 #
 default: help
 
-VERSION ?= 1.6.0
+VERSION ?= 1.7.0
 
 
 TARGET_APISIX_VERSION ?= "3.4.1-centos"
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ on: @@
       push:
         branches:
           - master
-          - v1.6.0
+          - 1.7.0
     concurrency:
       group: ${{ github.workflow }}-dev
@@ Expand Down @@