Skip to content

Commit

Permalink
fix: move make.sh to .buildkite
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshMock committed Mar 21, 2024
1 parent 43939f3 commit 71a54b7
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 10 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .buildkite/certs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The `ca.crt` and `ca.key` can be used to generate any other certificates that ma
for CI. Perhaps the easiest way to do so is using
[`elasticsearch-certutil`](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html)

Using the elasticsearch docker container, run the following from the `.ci/certs` directory
Using the elasticsearch docker container, run the following from the `.buildkite/certs` directory

```sh
docker run \
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions .ci/make.sh → .buildkite/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Skeleton for common build entry script for all elastic
# clients. Needs to be adapted to individual client usage.
#
# Must be called: ./.ci/make.sh <target> <params>
# Must be called: ./.buildkite/make.sh <target> <params>
#
# Version: 1.1.0
#
Expand Down Expand Up @@ -38,7 +38,7 @@ WORKFLOW=${WORKFLOW-staging}
set -euo pipefail

product="elastic/enterprise-search-js"
output_folder=".ci/output"
output_folder=".buildkite/output"
OUTPUT_DIR="$repo/${output_folder}"
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
mkdir -p "$OUTPUT_DIR"
Expand Down Expand Up @@ -116,7 +116,7 @@ esac
echo -e "\033[34;1mINFO: building $product container\033[0m"

docker build \
--file .ci/Dockerfile \
--file .buildkite/Dockerfile \
--tag ${product} \
--build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \
--build-arg USER_ID="$(id -u)" \
Expand All @@ -136,14 +136,14 @@ docker run \
--name make-enterprise-search-js \
--rm \
$product \
node .ci/make.mjs --task $TASK ${TASK_ARGS[*]}
node .buildkite/make.mjs --task $TASK ${TASK_ARGS[*]}

# ------------------------------------------------------- #
# Post Command tasks & checks
# ------------------------------------------------------- #

if [[ "$CMD" == "assemble" ]]; then
if compgen -G ".ci/output/*" > /dev/null; then
if compgen -G ".buildkite/output/*" > /dev/null; then
echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m"
else
echo -e "\033[31;1mTARGET: assemble failed, empty workspace!\033[0m"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/run-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ echo -e "\033[32;1mSUCCESS:\033[0m successfully started the ${STACK_VERSION} sta
echo -e "\033[32;1mBUILD: \033[31mJS \e[0m container.\033[0m"

docker build \
--file .ci/Dockerfile \
--file .buildkite/Dockerfile \
--tag elastic/enterprise-search-js \
--build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \
.
Expand Down
1 change: 0 additions & 1 deletion .ci/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion packages/enterprise-search-universal/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ test
scripts

# ci configuration
.ci
.travis.yml
certs
.github
Expand Down
1 change: 0 additions & 1 deletion packages/enterprise-search/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ test
scripts

# ci configuration
.ci
.travis.yml
certs
.github
Expand Down

0 comments on commit 71a54b7

Please sign in to comment.