From 7c76778342e251b95300c0669210643f65adee51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Fri, 16 Feb 2024 23:36:47 +0100 Subject: [PATCH] hi --- .github/workflows/test-import.yml | 4 +--- ci/fetch-feeds.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-import.yml b/.github/workflows/test-import.yml index fb4b0c9e..92dc1834 100644 --- a/.github/workflows/test-import.yml +++ b/.github/workflows/test-import.yml @@ -10,9 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v4 - - name: Fetch branches and submodules - run: git fetch --unshallow && git submodule update --init --checkout --remote && git checkout -b pr + run: git clone https://github.com/public-transport/transitous -b ${{ github.head_ref }} --recursive $GITHUB_WORKSPACE - name: Build docker images run: docker build -t transitous . -f ci/container/Containerfile - name: Verify that new feeds can be downloaded diff --git a/ci/fetch-feeds.py b/ci/fetch-feeds.py index 1686b9db..e0b96b7f 100755 --- a/ci/fetch-feeds.py +++ b/ci/fetch-feeds.py @@ -22,7 +22,7 @@ case "merge-request": # Find all files that were changed in the latest commit changed_files = subprocess.check_output( - ["git", "diff", "--name-only", "HEAD~1", "HEAD"]) \ + ["git", "diff", "--name-only", "origin/main", "HEAD"]) \ .decode().splitlines() changed_feeds = [f for f in changed_files if