From 0ebd833298fd73b8cf8351150f16ce39ad259bee Mon Sep 17 00:00:00 2001 From: Bogdan Mircea Date: Tue, 26 Sep 2023 16:41:13 +0300 Subject: [PATCH] Moved ci under .github dir Signed-off-by: Bogdan Mircea --- .github/actions/derive-cache-info/action.yml | 2 +- .github/actions/setup-codecov-rust/action.yml | 2 +- .github/actions/setup-testing-nodejs/action.yml | 2 +- {ci => .github/ci}/agency/docker-compose.yml | 0 {ci => .github/ci}/agency/localhost.env | 0 {ci => .github/ci}/util.sh | 0 {ci => .github/ci}/vdrproxy.dockerfile | 0 .github/workflows/main.yml | 6 +++--- 8 files changed, 6 insertions(+), 6 deletions(-) rename {ci => .github/ci}/agency/docker-compose.yml (100%) rename {ci => .github/ci}/agency/localhost.env (100%) rename {ci => .github/ci}/util.sh (100%) rename {ci => .github/ci}/vdrproxy.dockerfile (100%) diff --git a/.github/actions/derive-cache-info/action.yml b/.github/actions/derive-cache-info/action.yml index 7c56db06a7..606087e601 100644 --- a/.github/actions/derive-cache-info/action.yml +++ b/.github/actions/derive-cache-info/action.yml @@ -23,7 +23,7 @@ runs: - id: main shell: bash run: | - source ./ci/util.sh + source ./.github/ci/util.sh DOCKER_IMG=${{ inputs.docker-img }} CACHE_KEY=`as_docker_cache_key $DOCKER_IMG` CACHE_DIR="/tmp/cachedir-$CACHE_KEY" diff --git a/.github/actions/setup-codecov-rust/action.yml b/.github/actions/setup-codecov-rust/action.yml index fee5adaacb..1808bbec8b 100644 --- a/.github/actions/setup-codecov-rust/action.yml +++ b/.github/actions/setup-codecov-rust/action.yml @@ -29,4 +29,4 @@ runs: docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35 docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }} sleep 5 - docker-compose -f ./ci/agency/docker-compose.yml up -d \ No newline at end of file + docker-compose -f ./.github/ci/agency/docker-compose.yml up -d \ No newline at end of file diff --git a/.github/actions/setup-testing-nodejs/action.yml b/.github/actions/setup-testing-nodejs/action.yml index e924acc7c1..40a8512802 100644 --- a/.github/actions/setup-testing-nodejs/action.yml +++ b/.github/actions/setup-testing-nodejs/action.yml @@ -40,7 +40,7 @@ runs: docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35 docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }} sleep 5 - docker-compose -f ./ci/agency/docker-compose.yml up -d + docker-compose -f ./.github/ci/agency/docker-compose.yml up -d - name: "Build binding module" shell: bash run: (cd wrappers/vcx-napi-rs && npm install && npm run build:napi:debug) diff --git a/ci/agency/docker-compose.yml b/.github/ci/agency/docker-compose.yml similarity index 100% rename from ci/agency/docker-compose.yml rename to .github/ci/agency/docker-compose.yml diff --git a/ci/agency/localhost.env b/.github/ci/agency/localhost.env similarity index 100% rename from ci/agency/localhost.env rename to .github/ci/agency/localhost.env diff --git a/ci/util.sh b/.github/ci/util.sh similarity index 100% rename from ci/util.sh rename to .github/ci/util.sh diff --git a/ci/vdrproxy.dockerfile b/.github/ci/vdrproxy.dockerfile similarity index 100% rename from ci/vdrproxy.dockerfile rename to .github/ci/vdrproxy.dockerfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 530403d7b6..d1e98c100c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,8 +64,8 @@ jobs: run: | set -x - HASH_DOCKERFILE_LIBVCX=${{ hashFiles('ci/libvcx.dockerfile') }} - HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('ci/vdrproxy.dockerfile') }} + HASH_DOCKERFILE_LIBVCX=${{ hashFiles('.github/ci/libvcx.dockerfile') }} + HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('.github/ci/vdrproxy.dockerfile') }} HASH_SRC_LIBVDRTOOLS=${{ hashFiles('libvdrtools') }} HASH_SRC_LIBVCX=${{ hashFiles('libvcx') }} HASH_SRC_ARIESVCX=${{ hashFiles('aries_vcx') }} @@ -232,7 +232,7 @@ jobs: uses: ./.github/actions/build-image with: docker-img: ${{ env.DOCKER_IMG_CACHED }} - dockerfile-path: "ci/vdrproxy.dockerfile" + dockerfile-path: ".github/ci/vdrproxy.dockerfile" build-arg: "ALPINE_CORE_IMAGE=$DOCKER_IMG_CACHED_ALPINE_CORE" branch-name: ${{ env.BRANCH_NAME }} branch-main: ${{ env.MAIN_BRANCH }}