From a313b8773ab5c9e8477dc3accf6ac36895e3736c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 09:15:01 +0200 Subject: [PATCH] Revert "Update .ci/make.sh with new command skeletons" (#1558) (#1560) This reverts commit 5a16c18ed43e5538a5339efe1811a815e7d08fe2. Co-authored-by: Martijn Laarman --- .ci/make.sh | 176 ++++------------------------------------------------ 1 file changed, 12 insertions(+), 164 deletions(-) diff --git a/.ci/make.sh b/.ci/make.sh index dfbffc79..92316e07 100755 --- a/.ci/make.sh +++ b/.ci/make.sh @@ -1,170 +1,18 @@ -#!/usr/bin/env bash +#!/bin/bash -# ------------------------------------------------------- # -# -# Skeleton for common build entry script for all elastic -# clients. Needs to be adapted to individual client usage. -# -# Must be called: ./.ci/make.sh -# -# Version: 1.1.0 -# -# Targets: -# --------------------------- -# assemble : build client artefacts with version -# bump : bump client internals to version -# codegen : generate endpoints -# docsgen : generate documentation -# examplegen : generate the doc examples -# clean : clean workspace -# -# ------------------------------------------------------- # +set -eo pipefail -# ------------------------------------------------------- # -# Bootstrap -# ------------------------------------------------------- # +BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +BASE_DIR="$( dirname "$BASE_DIR" )" -script_path=$(dirname "$(realpath -s "$0")") -repo=$(realpath "$script_path/../") - -# shellcheck disable=SC1090 -CMD=$1 -TASK=$1 -TASK_ARGS=() -VERSION=$2 -STACK_VERSION=$VERSION -set -euo pipefail - -product="elastic/elasticsearch-py" -output_folder=".ci/output" -codegen_folder=".ci/output" -OUTPUT_DIR="$repo/${output_folder}" -REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}" -mkdir -p "$OUTPUT_DIR" - -echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m" -echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m" -echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m" - -# ------------------------------------------------------- # -# Parse Command -# ------------------------------------------------------- # - -case $CMD in - clean) - echo -e "\033[36;1mTARGET: clean workspace $output_folder\033[0m" - rm -rf "$output_folder" - echo -e "\033[32;1mdone.\033[0m" - exit 0 - ;; - assemble) - if [ -v $VERSION ]; then - echo -e "\033[31;1mTARGET: assemble -> missing version parameter\033[0m" - exit 1 - fi - echo -e "\033[36;1mTARGET: assemble artefact $VERSION\033[0m" - TASK=release - TASK_ARGS=("$VERSION" "$output_folder") - ;; - codegen) - if [ -v $VERSION ]; then - echo -e "\033[31;1mTARGET: codegen -> missing version parameter\033[0m" - exit 1 - fi - echo -e "\033[36;1mTARGET: codegen API v$VERSION\033[0m" - TASK=codegen - # VERSION is BRANCH here for now - TASK_ARGS=("$VERSION" "$codegen_folder") - ;; - docsgen) - if [ -v $VERSION ]; then - echo -e "\033[31;1mTARGET: docsgen -> missing version parameter\033[0m" - exit 1 - fi - echo -e "\033[36;1mTARGET: generate docs for $VERSION\033[0m" - TASK=codegen - # VERSION is BRANCH here for now - TASK_ARGS=("$VERSION" "$codegen_folder") - ;; - examplesgen) - echo -e "\033[36;1mTARGET: generate examples\033[0m" - TASK=codegen - # VERSION is BRANCH here for now - TASK_ARGS=("$VERSION" "$codegen_folder") - ;; - bump) - if [ -v $VERSION ]; then - echo -e "\033[31;1mTARGET: bump -> missing version parameter\033[0m" - exit 1 - fi - echo -e "\033[36;1mTARGET: bump to version $VERSION\033[0m" - TASK=bump - # VERSION is BRANCH here for now - TASK_ARGS=("$VERSION") - ;; - *) - echo -e "\nUsage:\n\t $CMD is not supported right now\n" - exit 1 -esac - - -# ------------------------------------------------------- # -# Build Container -# ------------------------------------------------------- # - -echo -e "\033[34;1mINFO: building $product container\033[0m" - -#docker build --file .ci/DockerFile --tag ${product} \ -# --build-arg USER_ID="$(id -u)" \ -# --build-arg GROUP_ID="$(id -g)" . - - -# ------------------------------------------------------- # -# Run the Container -# ------------------------------------------------------- # - -echo -e "\033[34;1mINFO: running $product container\033[0m" - -#docker run \ -# --env "DOTNET_VERSION" \ -# --name test-runner \ -# --volume $REPO_BINDING \ -# --rm \ -# $product \ -# /bin/bash -c "./build.sh $TASK ${TASK_ARGS[*]} && chown -R $(id -u):$(id -g) ." - -# ------------------------------------------------------- # -# Post Command tasks & checks -# ------------------------------------------------------- # - -if [[ "$CMD" == "assemble" ]]; then - python $repo/utils/build-dists.py $VERSION - cp $repo/dist/* $repo/.ci/output - cd $repo/.ci/output && tar -czvf elasticsearch-py-$VERSION.tar.gz * && cd - - - if compgen -G ".ci/output/*" > /dev/null; then - echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m" - exit 0 - else - echo -e "\033[31;1mTARGET: assemble failed, empty workspace!\033[0m" - exit 1 - fi -fi - -if [[ "$CMD" == "bump" ]]; then - echo "TODO" -fi - -if [[ "$CMD" == "codegen" ]]; then - echo "TODO" -fi - -if [[ "$CMD" == "docsgen" ]]; then - echo "TODO" -fi - -if [[ "$CMD" == "examplesgen" ]]; then - echo "TODO" +if [[ "$1" == "assemble" ]]; then + mkdir -p $BASE_DIR/.ci/output + docker build . --tag elastic/elasticsearch-py -f .ci/Dockerfile + docker run --rm -v $BASE_DIR/.ci/output:/code/elasticsearch-py/dist \ + elastic/elasticsearch-py \ + python /code/elasticsearch-py/utils/build-dists.py $2 + cd ./.ci/output && tar -czvf elasticsearch-py-$2.tar.gz * && cd - + exit 0 fi echo "Must be called with '.ci/make.sh [command]"