fff

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

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -42,17 +42,17 @@ 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
         
-        ALLAUTH_INSTALL_DIR=/home/runner
+        ALLAUTH_INSTALL_DIR=$HOME
         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
         cd -
-
+        
         pip install -r requirements.txt
-
+        pip install $ALLAUTH_INSTALL_DIR/django-allauth
         pip install --index-url https://test.pypi.org/simple runregistry==1.0.0
 
         pip install --upgrade pytest pytest-django pytest-cov codecov mixer selenium

diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
@@ -3,7 +3,7 @@ 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
-ALLAUTH_INSTALL_DIR=/home/runner
+ALLAUTH_INSTALL_DIR=$HOME
 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
@@ -16,7 +16,7 @@ cd -
 /usr/libexec/s2i/assemble
 rc=$?
 
-ls
+pip install $ALLAUTH_INSTALL_DIR/django-allauth
 
 # Temporarily install runregistry api client from test PyPI
 pip install --index-url https://test.pypi.org/simple runregistry==1.0.0

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 /home/runner/django-allauth
+#-e /home/runner/django-allauth
 #django-allauth<1.0.0
 django-bootstrap3<24.0
 django-filter<24.0