Problem: GH actions do not use ci_build.sh

Solution: Make it DRY by using ci_build.sh
buildout · May 24, 2020 · d1bdb0e · d1bdb0e
1 parent 6b3c226
commit d1bdb0e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml
@@ -13,13 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Build container with Python ${{ matrix.python-version }}
+    - name: Test in container with Python ${{ matrix.python-version }}
       env:
         PYTHON_VER: ${{matrix.python-version}}
+        BUILD_TYPE: centos_containers
       run: |
-        docker build -f .github/workflows/Dockerfile --tag centos_buildout:python${PYTHON_VER} --build-arg PYTHON_VER=${PYTHON_VER} .
-    - name: Test
-      env:
-        PYTHON_VER: ${{matrix.python-version}}
-      run: |
-        docker run centos_buildout:python${PYTHON_VER} /bin/bash -c 'RUN_COVERAGE= COVERAGE_REPORT= /buildout/bin/test -c -vvv'
+        ./ci_build.sh
diff --git a/.github/workflows/debian-sys.yml b/.github/workflows/debian-sys.yml
@@ -0,0 +1,20 @@
+name: Debian container with system Python
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Test in container with system Python
+      env:
+        BUILD_TYPE: debian_sys_container
+      run: |
+        ./ci_build.sh
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -13,13 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Build container with Python ${{ matrix.python-version }}
+    - name: Test in container with Python ${{ matrix.python-version }}
       env:
         PYTHON_VER: ${{matrix.python-version}}
+        BUILD_TYPE: debian_containers
       run: |
-        docker build -f .github/workflows/Dockerfile-debian --tag debian_buildout:python${PYTHON_VER} --build-arg PYTHON_VER=${PYTHON_VER} .
-    - name: Test
-      env:
-        PYTHON_VER: ${{matrix.python-version}}
-      run: |
-        docker run debian_buildout:python${PYTHON_VER} /bin/bash -c 'RUN_COVERAGE= COVERAGE_REPORT= /buildout/bin/test -c -vvv'
+        ./ci_build.sh