Propagate recent branch name changes to documentation en CI

Author: Anaethelion

.ci/jobs/elastic+go-elasticsearch+7.x.yml .ci/jobs/elastic+go-elasticsearch+7.16.yml

@@ -1,13 +1,13 @@
 ---
 - job:
-    name: elastic+go-elasticsearch+7.x
-    display-name: 'elastic / go-elasticsearch # 7.x'
-    description: Testing the go-elasticsearch 7.x branch.
+    name: elastic+go-elasticsearch+7.16
+    display-name: 'elastic / go-elasticsearch # 7.16'
+    description: Testing the go-elasticsearch 7.16 branch.
     junit_results: "*-junit.xml"
     parameters:
       - string:
           name: branch_specifier
-          default: refs/heads/7.x
+          default: refs/heads/7.16
           description: The Git branch specifier to build
     triggers:
       - github

.doc/installation.asciidoc

@@ -5,14 +5,14 @@ To install the 7.x version of the client, add the package to your `go.mod` file:
 
 [source,text]
 ------------------------------------
-require github.com/elastic/go-elasticsearch/v7 7.x
+require github.com/elastic/go-elasticsearch/v7 7.16
 ------------------------------------
 
 Or, clone the repository:
 
 [source,text]
 ------------------------------------
-git clone --branch 7.x https://github.com/elastic/go-elasticsearch.git $GOPATH/src/github
+git clone --branch 7.16 https://github.com/elastic/go-elasticsearch.git $GOPATH/src/github
 ------------------------------------
 
 To install another version, modify the path or the branch name accordingly. The 
@@ -27,7 +27,7 @@ mkdir my-elasticsearch-app && cd my-elasticsearch-app
 cat > go.mod <<-END
   module my-elasticsearch-app
 
-  require github.com/elastic/go-elasticsearch/v8 master
+  require github.com/elastic/go-elasticsearch/v8 main
 END
 
 cat > main.go <<-END

.github/workflows/build.yml

@@ -6,13 +6,13 @@ on:
   push:
     branches:
       - github-actions
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
   pull_request:
     branches:
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
 
 env:

.github/workflows/test-integration.yml

@@ -6,13 +6,13 @@ on:
   push:
     branches:
       - github-actions
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
   pull_request:
     branches:
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
 
 env:

.github/workflows/test-unit.yml

@@ -6,13 +6,13 @@ on:
   push:
     branches:
       - github-actions
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
   pull_request:
     branches:
-      - master
-      - 7.x
+      - main
+      - 7.16
       - 6.x
 
 env:

Makefile

@@ -187,7 +187,7 @@ ifeq ($(origin commits), undefined)
 	@exit 2
 endif
 ifndef branches
-	$(eval branches_list = '7.x' '6.x' '5.x')
+	$(eval branches_list = '7.16' '6.x' '5.x')
 else
 	$(eval branches_list = $(shell echo $(branches) | tr ',' ' ') )
 endif

README.md

@@ -4,11 +4,11 @@ The official Go client for [Elasticsearch](https://www.elastic.co/products/elast
 
 [![GoDoc](https://godoc.org/github.com/elastic/go-elasticsearch?status.svg)](https://pkg.go.dev/github.com/elastic/go-elasticsearch/v7)
 [![Go Report Card](https://goreportcard.com/badge/github.com/elastic/go-elasticsearch)](https://goreportcard.com/report/github.com/elastic/go-elasticsearch)
-[![codecov.io](https://codecov.io/github/elastic/go-elasticsearch/coverage.svg?branch=master)](https://codecov.io/gh/elastic/go-elasticsearch?branch=master)
-[![Build](https://github.com/elastic/go-elasticsearch/workflows/Build/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3A7.x)
-[![Unit](https://github.com/elastic/go-elasticsearch/workflows/Unit/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3A7.x)
-[![Integration](https://github.com/elastic/go-elasticsearch/workflows/Integration/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3A7.x)
-[![API](https://github.com/elastic/go-elasticsearch/workflows/API/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3A7.x)
+[![codecov.io](https://codecov.io/github/elastic/go-elasticsearch/coverage.svg?branch=main)](https://codecov.io/gh/elastic/go-elasticsearch?branch=main)
+[![Build](https://github.com/elastic/go-elasticsearch/workflows/Build/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3Amain)
+[![Unit](https://github.com/elastic/go-elasticsearch/workflows/Unit/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3Amain)
+[![Integration](https://github.com/elastic/go-elasticsearch/workflows/Integration/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3Amain)
+[![API](https://github.com/elastic/go-elasticsearch/workflows/API/badge.svg)](https://github.com/elastic/go-elasticsearch/actions?query=branch%3Amain)
 
 ## Compatibility
 
@@ -17,14 +17,14 @@ Elasticsearch language clients are only backwards compatible with default distri
 
 When using Go modules, include the version in the import path, and specify either an explicit version or a branch:
 
-    require github.com/elastic/go-elasticsearch/v7 7.x
+    require github.com/elastic/go-elasticsearch/v7 7.16
     require github.com/elastic/go-elasticsearch/v7 7.0.0
 
 It's possible to use multiple versions of the client in a single project:
 
     // go.mod
     github.com/elastic/go-elasticsearch/v6 6.x
-    github.com/elastic/go-elasticsearch/v7 7.x
+    github.com/elastic/go-elasticsearch/v7 7.16
 
     // main.go
     import (
@@ -35,19 +35,19 @@ It's possible to use multiple versions of the client in a single project:
     es6, _ := elasticsearch6.NewDefaultClient()
     es7, _ := elasticsearch7.NewDefaultClient()
 
-The `master` branch of the client is compatible with the current `master` branch of Elasticsearch.
+The `main` branch of the client is compatible with the current `master` branch of Elasticsearch.
 
 <!-- ----------------------------------------------------------------------------------------------- -->
 
 ## Installation
 
 Add the package to your `go.mod` file:
 
-    require github.com/elastic/go-elasticsearch/v7 7.x
+    require github.com/elastic/go-elasticsearch/v8 main
 
 Or, clone the repository:
 
-    git clone --branch 7.x https://github.com/elastic/go-elasticsearch.git $GOPATH/src/github.com/elastic/go-elasticsearch
+    git clone --branch main https://github.com/elastic/go-elasticsearch.git $GOPATH/src/github.com/elastic/go-elasticsearch
 
 A complete example:
 
@@ -57,7 +57,7 @@ mkdir my-elasticsearch-app && cd my-elasticsearch-app
 cat > go.mod <<-END
   module my-elasticsearch-app
 
-  require github.com/elastic/go-elasticsearch/v7 7.x
+  require github.com/elastic/go-elasticsearch/v8 main
 END
 
 cat > main.go <<-END