From 27e8a665cf4b2511d79640a9ec5afb504389b6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Lindstr=C3=B6m?= Date: Fri, 20 Dec 2019 18:38:16 +0800 Subject: [PATCH] Remove circleci in favour of Github Actions --- .circleci/Docker/docker-commands.sh | 41 ---------- .circleci/config.yml | 15 ---- {.circleci/Docker => Docker}/Docker.variables | 0 {.circleci/Docker => Docker}/Dockerfile | 0 .../Docker => Docker}/build-and-test.sh | 0 Docker/docker-commands.sh | 79 +++++++++++++++++++ {.circleci/Docker => Docker}/entrypoint.sh | 0 7 files changed, 79 insertions(+), 56 deletions(-) delete mode 100755 .circleci/Docker/docker-commands.sh delete mode 100644 .circleci/config.yml rename {.circleci/Docker => Docker}/Docker.variables (100%) rename {.circleci/Docker => Docker}/Dockerfile (100%) rename {.circleci/Docker => Docker}/build-and-test.sh (100%) create mode 100755 Docker/docker-commands.sh rename {.circleci/Docker => Docker}/entrypoint.sh (100%) diff --git a/.circleci/Docker/docker-commands.sh b/.circleci/Docker/docker-commands.sh deleted file mode 100755 index e309e4c93..000000000 --- a/.circleci/Docker/docker-commands.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -get_repository_root(){ - local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)" - echo "$REPOSITORY_ROOT" -} - -get_repository_subdir(){ - REPOSITORY_ROOT=$(get_repository_root) - CUR_DIR=$(pwd) - SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*") - echo "$SUB_DIR" -} - -docker-interactive() { - REPOSITORY_ROOT=$(get_repository_root) - SUB_DIR=$(get_repository_subdir) - - echo "SUB_DIR: " "$SUB_DIR" - - source $REPOSITORY_ROOT/.circleci/Docker/Docker.variables - echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" - - echo "Got command: " "$*" - USER_ID=$(id -u $USER) - echo "Using USER_ID:" $USER_ID - - docker run --env LOCAL_USER_ID=$USER_ID \ - --rm \ - --interactive \ - --volume $REPOSITORY_ROOT:/tmp/workspace \ - --workdir /tmp/workspace$SUB_DIR \ - --env "TERM=xterm-256color" \ - --tty \ - "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash -} - -docker-help() { - echo "docker-interactive - Start an interactive bash session inside docker container and remove it on exit" - echo "docker-help - Show this help text" -} diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 82f97de68..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -version: 2.0 - -jobs: - "Tomahawk - build, test": - docker: - - image: tomahawkmusicplayer/ubuntu:latest - steps: - - checkout - - run: /usr/local/bin/build-and-test.sh -workflows: - version: 2 - build_and_test: - jobs: - - "Tomahawk - build, test" \ No newline at end of file diff --git a/.circleci/Docker/Docker.variables b/Docker/Docker.variables similarity index 100% rename from .circleci/Docker/Docker.variables rename to Docker/Docker.variables diff --git a/.circleci/Docker/Dockerfile b/Docker/Dockerfile similarity index 100% rename from .circleci/Docker/Dockerfile rename to Docker/Dockerfile diff --git a/.circleci/Docker/build-and-test.sh b/Docker/build-and-test.sh similarity index 100% rename from .circleci/Docker/build-and-test.sh rename to Docker/build-and-test.sh diff --git a/Docker/docker-commands.sh b/Docker/docker-commands.sh new file mode 100755 index 000000000..eb136b344 --- /dev/null +++ b/Docker/docker-commands.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +get_repository_root(){ + local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)" + echo "$REPOSITORY_ROOT" +} + +get_repository_subdir(){ + REPOSITORY_ROOT=$(get_repository_root) + CUR_DIR=$(pwd) + SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*") + echo "$SUB_DIR" +} + +# Run commands inside docker container +_docker_run() { + REPOSITORY_ROOT=$(get_repository_root) + SUB_DIR=$(get_repository_subdir) + + echo "SUB_DIR: " "$SUB_DIR" + + source $REPOSITORY_ROOT/Docker/Docker.variables + echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" + + echo "Got command: " "$*" + USER_ID=$(id -u $USER) + echo "Using USER_ID:" $USER_ID + + docker run --env LOCAL_USER_ID=$USER_ID \ + --rm \ + --volume $REPOSITORY_ROOT:/tmp/workspace \ + --workdir /tmp/workspace$SUB_DIR \ + --env "TERM=xterm-256color" \ + --tty \ + --privileged \ + "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" \ + $* +} + +# 1st command: Run make target inside docker +docker-make() { + _docker_run make "${@}" +} + +# 2nd command: Run bash command inside docker +docker-run() { + _docker_run "${@}" +} + +# 3rd command: Run bash interactive inside docker +docker-interactive() { + REPOSITORY_ROOT=$(get_repository_root) + SUB_DIR=$(get_repository_subdir) + + echo "SUB_DIR: " "$SUB_DIR" + + source $REPOSITORY_ROOT/Docker/Docker.variables + echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" + + echo "Got command: " "$*" + USER_ID=$(id -u $USER) + echo "Using USER_ID:" $USER_ID + + docker run --env LOCAL_USER_ID=$USER_ID \ + --rm \ + --interactive \ + --volume $REPOSITORY_ROOT:/tmp/workspace \ + --workdir /tmp/workspace$SUB_DIR \ + --env "TERM=xterm-256color" \ + --tty \ + "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash +} + +docker-help() { + echo "docker-make - Run a make target inside docker container" + echo "docker-run - Run a specific bash command inside docker container and remove container on exit" + echo "docker-interactive - Start an interactive bash session inside docker container and remove it on exit" + echo "docker-help - Show this help text" +} diff --git a/.circleci/Docker/entrypoint.sh b/Docker/entrypoint.sh similarity index 100% rename from .circleci/Docker/entrypoint.sh rename to Docker/entrypoint.sh