Merge branch 'vgvassilev:master' into issue526v102

vgvassilev · Jul 26, 2023 · 1bbe9a5 · 1bbe9a5
2 parents 4a7f0ff + 2d24f37
commit 1bbe9a5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,11 +38,13 @@ jobs:
           chmod +x git-clang-format
       - name: Run git-clang-format
         run: |
+          PR_BASE=$(git rev-list ${{ github.event.pull_request.head.sha }} ^${{ github.event.pull_request.base.sha }} | tail --lines 1 | xargs -I {} git rev-parse {}~1)
+          echo "running git clang-format against $PR_BASE commit"
           git \
           -c color.ui=always \
           -c diff.wsErrorHighlight=all \
           -c color.diff.whitespace='red reverse' \
-          clang-format-15 --diff --binary clang-format-15 origin/master -- demos/ include/ lib/ tools/ || \
+          clang-format-15 --diff --binary clang-format-15 --commit $PR_BASE -- demos/ include/ lib/ tools/ || \
           (echo "Please run the following git-clang-format locally to fix the formatting: \n
                 git clang-format origin/master -- demos/ include/ lib/ tools/" && exit 1)
   build:
@@ -82,12 +84,12 @@ jobs:
             os: macos-latest
             compiler: clang
             clang-runtime: '14'
-            
+
           - name: osx-clang-runtime15
             os: macos-latest
             compiler: clang
             clang-runtime: '15'
-            
+
           - name: osx-clang-runtime16
             os: macos-latest
             compiler: clang
@@ -414,7 +416,7 @@ jobs:
             os: ubuntu-22.04
             compiler: clang-15
             clang-runtime: '14'
-          
+
           - name: ubu22-clang15-runtime15
             os: ubuntu-22.04
             compiler: clang-15
@@ -614,15 +616,15 @@ jobs:
         echo "PATH_TO_LLVM_BUILD=$env:PATH_TO_LLVM_BUILD" >> $env:GITHUB_ENV
     - name: Setup CUDA 8 on Linux
       if: ${{ matrix.cuda == true }}
-      run: |     
-        wget --no-verbose https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run 
+      run: |
+        wget --no-verbose https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run
         wget --no-verbose https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run
         sh ./cuda_8.0.61_375.26_linux-run --tar mxvf
         sudo cp InstallUtils.pm /usr/lib/x86_64-linux-gnu/perl-base
         export $PERL5LIB
-        sudo sh cuda_8.0.61_375.26_linux-run --override --no-opengl-lib --silent --toolkit --kernel-source-path=/lib/modules/4.15.0-1113-azure/build 
-        sudo sh cuda_8.0.61.2_linux-run --silent --accept-eula 
-        export PATH=/usr/local/cuda-8.0/bin:${PATH} 
+        sudo sh cuda_8.0.61_375.26_linux-run --override --no-opengl-lib --silent --toolkit --kernel-source-path=/lib/modules/4.15.0-1113-azure/build
+        sudo sh cuda_8.0.61.2_linux-run --silent --accept-eula
+        export PATH=/usr/local/cuda-8.0/bin:${PATH}
         export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda-8.0/lib64
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
         echo "PATH=$PATH" >> $GITHUB_ENV

diff --git a/environment.yml b/environment.yml
@@ -1,5 +1,5 @@
 channels:
   - conda-forge
 dependencies:
-  - clad=1.0
+  - clad=0.9
   - xeus-cling
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 alabaster==0.7.13
 Babel==2.12.1
-certifi==2023.5.7
+certifi==2023.7.22
 charset-normalizer==3.1.0
 docutils==0.20.1
 idna==3.4