Skip to content

Commit

Permalink
Move from STACK_VERSION to SNAPSHOT_BRANCH (#2536)
Browse files Browse the repository at this point in the history
  • Loading branch information
pquentin authored Apr 30, 2024
1 parent 7d38f5f commit 9e0db88
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 80 deletions.
13 changes: 0 additions & 13 deletions .ci/bump.sh

This file was deleted.

58 changes: 0 additions & 58 deletions .ci/make.sh

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
name: build
if: github.repository_owner == 'elastic' # this action will fail if executed from a fork
runs-on: ubuntu-latest
env:
STACK_VERSION: 8.13-SNAPSHOT

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -53,8 +51,13 @@ jobs:
- name: Download artifacts
working-directory: ./clients-flight-recorder
run: |
if [[ -n "${GITHUB_BASE_REF+x}" ]]; then
branch=$GITHUB_BASE_REF
else
branch=$GITHUB_REF_NAME
fi
node scripts/upload-recording/download.js --branch latest
node scripts/clone-elasticsearch/index.js --version ${{ env.STACK_VERSION }}
node scripts/clone-elasticsearch/index.js --branch $branch
env:
GCS_CREDENTIALS: ${{ secrets.GCS_CREDENTIALS }}

Expand All @@ -69,4 +72,4 @@ jobs:

- name: Run validation
working-directory: ./elasticsearch-specification
run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }} --version ${{ env.STACK_VERSION }}
run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }}
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ dump-routes: ## Create a new schema with all generics expanded

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

bump:
@echo ">> bumping..."
.ci/bump.sh

help: ## Display help
@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)
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------
Expand Down
2 changes: 1 addition & 1 deletion specification/indices/create/IndicesCreateRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export interface Request extends RequestBase {
*/
timeout?: Duration
/**
The number of shard copies that must be active before proceeding with the operation.
The number of shard copies that must be active before proceeding with the operation.
* Set to `all` or any positive integer up to the total number of shards in the index (`number_of_replicas+1`).
* @server_default 1
*/
Expand Down

0 comments on commit 9e0db88

Please sign in to comment.