Skip to content

Commit

Permalink
Switched to git diffs via dl-git
Browse files Browse the repository at this point in the history
  • Loading branch information
altvod committed Oct 13, 2023
1 parent 79cb89c commit 0f72b0c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions docker_build/bake_ci.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions lib/dl_connector_clickhouse/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# dl_connector_clickhouse

Connector to the ClickHouse database
2 changes: 1 addition & 1 deletion tools/taskfiles/taskfile_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks:
$PYTHON -m venv $VENV_PATH
. $VENV_PATH/bin/activate
pip install -r requirements-localhost.txt
pip install -e $(realpath ../terrarium/dl_repmanager) $(realpath ../terrarium/bi_ci)
pip install -e $(realpath ../terrarium/dl_repmanager) $(realpath ../terrarium/bi_ci) $(realpath ../terrarium/dl_gitmanager)
status:
- test -f $VENV_PATH/bin/activate
# todo: deal with ci to skip ensure_venv
Expand Down

0 comments on commit 0f72b0c

Please sign in to comment.