ffff

CMSTrackerDPG · Jul 14, 2023 · b27f057 · b27f057
1 parent 65e2b40
commit b27f057
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -42,9 +42,10 @@ jobs:
         git config --global url."https://${{ secrets.CERN_GITLAB_USER }}:${{ secrets.CERN_GITLAB_TOKEN }}@gitlab.cern.ch".insteadOf https://gitlab.cern.ch
         python -m pip install --upgrade pip
         
-        mkdir -p /tmp/runner
-        git clone https://github.com/nothingface0/django-allauth.git /tmp/runner/django-allauth
-        cd /tmp/runner/django-allauth
+        ALLAUTH_INSTALL_DIR=/home/runner
+        mkdir -p $ALLAUTH_INSTALL_DIR
+        git clone https://github.com/nothingface0/django-allauth.git $ALLAUTH_INSTALL_DIR/django-allauth
+        cd $ALLAUTH_INSTALL_DIR/django-allauth
         git checkout 77368a8
         wget https://github.com/pennersr/django-allauth/compare/main...nothingface0:django-allauth:fix_cern_sso.patch --output-document=patch
         git apply patch --reject || true

diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
@@ -3,9 +3,10 @@ echo "Before assembling"
 git config --global url."https://$CERN_GITLAB_USER:$CERN_GITLAB_TOKEN@gitlab.cern.ch".insteadOf https://gitlab.cern.ch   
 
 # TODO: remove once PR in django-allauth merged
-mkdir -p /tmp/runner
-git clone https://github.com/nothingface0/django-allauth.git /tmp/runner/django-allauth
-cd /tmp/runner/django-allauth
+ALLAUTH_INSTALL_DIR=/home/runner
+mkdir -p $ALLAUTH_INSTALL_DIR
+git clone https://github.com/nothingface0/django-allauth.git $ALLAUTH_INSTALL_DIR/django-allauth
+cd $ALLAUTH_INSTALL_DIR/django-allauth
 git checkout 77368a8
 wget https://github.com/pennersr/django-allauth/compare/main...nothingface0:django-allauth:fix_cern_sso.patch --output-document=patch
 git apply patch --reject || true

diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ channels[daphne]
 channels_redis
 Django<4.2.0
 # TODO: Update this once PR is merged to django-allauth
--e /tmp/runner/django-allauth
+-e /home/runner/django-allauth
 #django-allauth<1.0.0
 django-bootstrap3<24.0
 django-filter<24.0