From e23b85af68e2ae9bf26fb4b16575ec7918563959 Mon Sep 17 00:00:00 2001 From: Grigory Statsenko Date: Fri, 13 Oct 2023 13:08:43 +0200 Subject: [PATCH] Switched to git diffs via dl-git --- .github/workflows/main.yml | 5 +++-- docker_build/bake_ci.hcl | 1 + lib/dl_connector_clickhouse/README.md | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 549aa1d16..c61dbd99e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,11 +75,12 @@ jobs: fetch-depth: 0 - run: git config --global --add safe.directory . - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} - - run: git fetch origin main + # FIXME: Remove this before merging!!!!!!!!!!!!!!!! + - run: git fetch origin use-dlgit-diff - name: Get packages affected by changes in the current commit id: get_affected run: | - TARGET_DATA=$(bash /src/ci/gh_list_changes.sh ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) + TARGET_DATA=$(dl-git diff-paths --base ${{ github.event.pull_request.base.sha }} --head ${{ github.event.pull_request.head.sha }}) echo "$TARGET_DATA" > /tmp/targets.json cat /tmp/targets.json . /venv/bin/activate && detect-affected-packages \ diff --git a/docker_build/bake_ci.hcl b/docker_build/bake_ci.hcl index d6362524a..a9e9e30b1 100644 --- a/docker_build/bake_ci.hcl +++ b/docker_build/bake_ci.hcl @@ -36,6 +36,7 @@ target "ci_with_src" { "COPY --from=bake_ctx_dl_src_terrarium / /src/", "COPY --from=bake_ctx_dl_src_ci / /src/", "RUN . /venv/bin/activate && pip install -e /src/terrarium/bi_ci", + "RUN . /venv/bin/activate && pip install -e /src/terrarium/dl_gitmanager", "RUN . /venv/bin/activate && cd /src/metapkg/ && poetry install --no-root --without=dev --with=ci", # todo: include stubs into the metapkg pyproject.toml "RUN . /venv/bin/activate && pip install -r /src/ci/requirements_types.txt" diff --git a/lib/dl_connector_clickhouse/README.md b/lib/dl_connector_clickhouse/README.md index 61c2cc456..4b12a6f3d 100644 --- a/lib/dl_connector_clickhouse/README.md +++ b/lib/dl_connector_clickhouse/README.md @@ -1 +1,3 @@ # dl_connector_clickhouse + + Connector to the ClickHouse database