Skip to content

Commit e021da3

Browse files
pquentingithub-actions[bot]
authored andcommitted
Move from STACK_VERSION to SNAPSHOT_BRANCH (#2536)
(cherry picked from commit 9e0db88)
1 parent cb14ed2 commit e021da3

File tree

5 files changed

+8
-80
lines changed

5 files changed

+8
-80
lines changed

.ci/bump.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

.ci/make.sh

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/validate-pr.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
name: build
1818
if: github.repository_owner == 'elastic' # this action will fail if executed from a fork
1919
runs-on: ubuntu-latest
20-
env:
21-
STACK_VERSION: 8.13-SNAPSHOT
2220

2321
steps:
2422
- uses: actions/checkout@v2
@@ -53,8 +51,13 @@ jobs:
5351
- name: Download artifacts
5452
working-directory: ./clients-flight-recorder
5553
run: |
54+
if [[ -n "${GITHUB_BASE_REF+x}" ]]; then
55+
branch=$GITHUB_BASE_REF
56+
else
57+
branch=$GITHUB_REF_NAME
58+
fi
5659
node scripts/upload-recording/download.js --branch latest
57-
node scripts/clone-elasticsearch/index.js --version ${{ env.STACK_VERSION }}
60+
node scripts/clone-elasticsearch/index.js --branch $branch
5861
env:
5962
GCS_CREDENTIALS: ${{ secrets.GCS_CREDENTIALS }}
6063

@@ -69,4 +72,4 @@ jobs:
6972

7073
- name: Run validation
7174
working-directory: ./elasticsearch-specification
72-
run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }} --version ${{ env.STACK_VERSION }}
75+
run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }}

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ dump-routes: ## Create a new schema with all generics expanded
5555

5656
contrib: | generate license-check spec-format-fix transform-to-openapi ## Pre contribution target
5757

58-
bump:
59-
@echo ">> bumping..."
60-
.ci/bump.sh
61-
6258
help: ## Display help
6359
@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
6460
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------

specification/indices/create/IndicesCreateRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export interface Request extends RequestBase {
5454
*/
5555
timeout?: Duration
5656
/**
57-
The number of shard copies that must be active before proceeding with the operation.
57+
The number of shard copies that must be active before proceeding with the operation.
5858
* Set to `all` or any positive integer up to the total number of shards in the index (`number_of_replicas+1`).
5959
* @server_default 1
6060
*/

0 commit comments

Comments
 (0)