From bfdf38bee7c9a81703593402765f562fe8cce824 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 2 Feb 2021 15:24:35 -0800 Subject: [PATCH 1/2] fix: Use django/stable/2.2.x branch in CI --- .kokoro/build.sh | 2 +- django_test_suite.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 220d46a7e8..74a3bd98db 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,7 +44,7 @@ export RUNNING_SPANNER_BACKEND_TESTS=1 pip3 install . export DJANGO_TESTS_DIR="django_tests_dir" -mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django +mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch "stable/2.2.x" https://github.com/django/django.git $DJANGO_TESTS_DIR/django # Install dependencies for Django tests. sudo apt-get update diff --git a/django_test_suite.sh b/django_test_suite.sh index 12d9ee6582..c441e16b51 100755 --- a/django_test_suite.sh +++ b/django_test_suite.sh @@ -18,7 +18,7 @@ mkdir -p $DJANGO_TESTS_DIR if [ $SPANNER_EMULATOR_HOST != 0 ] then pip3 install . - git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django + git clone --depth 1 --single-branch --branch "stable/2.2.x" https://github.com/django/django.git $DJANGO_TESTS_DIR/django fi # Install dependencies for Django tests. From e817bbcdc58d2378c83d75eb39bde9a451b154cb Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 2 Feb 2021 15:44:01 -0800 Subject: [PATCH 2/2] Use c24t/django --- .kokoro/build.sh | 2 +- django_test_suite.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 74a3bd98db..acbc2f11f6 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,7 +44,7 @@ export RUNNING_SPANNER_BACKEND_TESTS=1 pip3 install . export DJANGO_TESTS_DIR="django_tests_dir" -mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch "stable/2.2.x" https://github.com/django/django.git $DJANGO_TESTS_DIR/django +mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch "spanner/stable/2.2.x" https://github.com/c24t/django.git $DJANGO_TESTS_DIR/django # Install dependencies for Django tests. sudo apt-get update diff --git a/django_test_suite.sh b/django_test_suite.sh index c441e16b51..8380bb24e3 100755 --- a/django_test_suite.sh +++ b/django_test_suite.sh @@ -18,7 +18,7 @@ mkdir -p $DJANGO_TESTS_DIR if [ $SPANNER_EMULATOR_HOST != 0 ] then pip3 install . - git clone --depth 1 --single-branch --branch "stable/2.2.x" https://github.com/django/django.git $DJANGO_TESTS_DIR/django + git clone --depth 1 --single-branch --branch "spanner/stable/2.2.x" https://github.com/c24t/django.git $DJANGO_TESTS_DIR/django fi # Install dependencies for Django tests.