Refactor Linux CI

jdavid · jdavid · commit ab6a5714176b · 2021-02-13T15:36:37.000+01:00
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -5,8 +5,7 @@ on:
   push:
 
 env:
-  PREFIX: "${{ github.workspace }}/../venv"
-  LIBGIT2_VERSION: 1.1.0
+  LIBGIT2: "${{ github.workspace }}/ci/install"
 
 jobs:
   build:
@@ -16,36 +15,20 @@ jobs:
         python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
 
     steps:
-    - name: Build libssh2
-      run: |
-        wget https://www.libssh2.org/download/libssh2-1.9.0.tar.gz
-        tar xf libssh2-1.9.0.tar.gz
-        cd libssh2-1.9.0
-        ./configure --prefix=$PREFIX --disable-static
-        make
-        make install
-
-    - name: Build libgit2
-      env:
-        CMAKE_PREFIX_PATH: "${{ env.PREFIX }}"
+    - name: Checkout pygit2
+      uses: actions/checkout@v2
+
+    - name: Build libraries
+      working-directory: ci
       run: |
-        wget https://github.com/libgit2/libgit2/releases/download/v$LIBGIT2_VERSION/libgit2-$LIBGIT2_VERSION.tar.gz
-        tar xf libgit2-$LIBGIT2_VERSION.tar.gz
-        cd libgit2-$LIBGIT2_VERSION
-        cmake . -DBUILD_CLAR=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX
-        cmake --build . --target install
+        /bin/sh build.sh
 
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Checkout pygit2
-      uses: actions/checkout@v2
-
     - name: Build pygit2
-      env:
-        LIBGIT2: "${{ env.PREFIX }}"
       run: |
         python setup.py egg_info
         pip install -r pygit2.egg-info/requires.txt
@@ -54,6 +37,6 @@ jobs:
 
     - name: Test
       env:
-        LD_LIBRARY_PATH: "${{ env.PREFIX }}/lib:$LD_LIBRARY_PATH"
+        LD_LIBRARY_PATH: "${{ env.LIBGIT2 }}/lib:$LD_LIBRARY_PATH"
       run: |
         pytest
diff --git a/.travis.sh b/.travis.sh
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ arch:
 
 env:
   global:
-    LIBGIT2: ~/install/
+    LIBGIT2: ${TRAVIS_BUILD_DIR}/ci/install
     LD_LIBRARY_PATH: ${LIBGIT2}/lib:${LD_LIBRARY_PATH}
     LIBGIT2_VERSION: "1.1"
 
@@ -71,7 +71,9 @@ jobs:
 
 before_install:
   - sudo apt-get -y install cmake
-  - ./.travis.sh "${LIBGIT2_VERSION}"
+  - cd ci
+  - /bin/sh build.sh
+  - cd ..
 
 install:
   - python setup.py egg_info
diff --git a/ci/build.sh b/ci/build.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+LIBSSH2_VERSION=1.9.0
+LIBGIT2_VERSION=1.1.0
+
+PREFIX=`realpath install`
+
+wget https://www.libssh2.org/download/libssh2-$LIBSSH2_VERSION.tar.gz
+tar xf libssh2-$LIBSSH2_VERSION.tar.gz
+cd libssh2-$LIBSSH2_VERSION
+./configure --prefix=$PREFIX --disable-static
+make
+make install
+cd ..
+
+wget https://github.com/libgit2/libgit2/releases/download/v$LIBGIT2_VERSION/libgit2-$LIBGIT2_VERSION.tar.gz
+tar xf libgit2-$LIBGIT2_VERSION.tar.gz
+cd libgit2-$LIBGIT2_VERSION
+CMAKE_PREFIX_PATH=$PREFIX cmake . -DBUILD_CLAR=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX
+cmake --build . --target install
+cd ..
