diff --git a/.buildkite/run-tests b/.buildkite/run-tests index 6d1eb9c..d70cee8 100755 --- a/.buildkite/run-tests +++ b/.buildkite/run-tests @@ -54,7 +54,7 @@ echo -e "PYTHON_CONNECTION_CLASS $PYTHON_CONNECTION_CLASS" echo -e "--- :docker: Build elasticsearch-serverless-python container" docker build \ - --file .ci/Dockerfile \ + --file .github/Dockerfile \ --tag elasticsearch-serverless-python \ --build-arg "PYTHON_VERSION=$PYTHON_VERSION" \ . diff --git a/.ci/Dockerfile b/.github/Dockerfile similarity index 100% rename from .ci/Dockerfile rename to .github/Dockerfile diff --git a/.ci/make.sh b/.github/make.sh similarity index 87% rename from .ci/make.sh rename to .github/make.sh index 0850858..ca80474 100755 --- a/.ci/make.sh +++ b/.github/make.sh @@ -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 +# Must be called: ./.github/make.sh # # Version: 1.1.0 # @@ -36,8 +36,8 @@ STACK_VERSION=$VERSION set -euo pipefail product="elastic/elasticsearch-serverless-python" -output_folder=".ci/output" -codegen_folder=".ci/output" +output_folder=".github/output" +codegen_folder=".github/output" OUTPUT_DIR="$repo/${output_folder}" REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}" WORKFLOW="${WORKFLOW-staging}" @@ -114,7 +114,7 @@ echo -e "\033[34;1mINFO: building $product container\033[0m" docker build \ --build-arg BUILDER_UID="$(id -u)" \ - --file $repo/.ci/Dockerfile \ + --file $repo/.github/Dockerfile \ --tag ${product} \ . @@ -126,21 +126,21 @@ echo -e "\033[34;1mINFO: running $product container\033[0m" if [[ "$CMD" == "assemble" ]]; then - # Build dists into .ci/output + # Build dists into .github/output docker run \ -u "$(id -u)" \ - --rm -v $repo/.ci/output:/code/elasticsearch-serverless-python/dist \ + --rm -v $repo/.github/output:/code/elasticsearch-serverless-python/dist \ $product \ /bin/bash -c "python /code/elasticsearch-serverless-python/utils/build-dists.py $VERSION" - # Verify that there are dists in .ci/output - if compgen -G ".ci/output/*" > /dev/null; then + # Verify that there are dists in .github/output + if compgen -G ".github/output/*" > /dev/null; then - # Tarball everything up in .ci/output + # Tarball everything up in .github/output if [[ "$WORKFLOW" == 'snapshot' ]]; then - cd $repo/.ci/output && tar -czvf elasticsearch-serverless-python-$VERSION-SNAPSHOT.tar.gz * && cd - + cd $repo/.github/output && tar -czvf elasticsearch-serverless-python-$VERSION-SNAPSHOT.tar.gz * && cd - else - cd $repo/.ci/output && tar -czvf elasticsearch-serverless-python-$VERSION.tar.gz * && cd - + cd $repo/.github/output && tar -czvf elasticsearch-serverless-python-$VERSION.tar.gz * && cd - fi echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m" @@ -175,5 +175,5 @@ if [[ "$CMD" == "examplesgen" ]]; then echo "TODO" fi -echo "Must be called with '.ci/make.sh [command]" +echo "Must be called with '.github/make.sh [command]" exit 1 diff --git a/.ci/run-nox.sh b/.github/run-nox.sh similarity index 100% rename from .ci/run-nox.sh rename to .github/run-nox.sh diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 305f4d8..66a1417 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -79,7 +79,7 @@ jobs: python -m pip install nox - name: Run tests shell: bash - run: .ci/run-nox.sh + run: .github/run-nox.sh env: PYTHON_VERSION: ${{ matrix.python-version }} NOX_SESSION: ${{ matrix.nox-session }} diff --git a/.gitignore b/.gitignore index 891e7df..6b46d35 100644 --- a/.gitignore +++ b/.gitignore @@ -143,7 +143,7 @@ cython_debug/ # elasticsearch files test_elasticsearch/cover test_elasticsearch/local.py -.ci/output +.github/output junit/ # sample code for GitHub issues