Add more python versions (#3)

* Add more python versions * Remove versions which fails * Reduce retries to fail faster
Flaconi · Dec 22, 2022 · 26e40ec · 26e40ec
1 parent fcb497e
commit 26e40ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -15,6 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         PYTHON:
+          - 3.5.10
+          - 3.6.15
           - 3.7.16
           - 3.8.16
           - 3.9.16
@@ -26,7 +28,7 @@ jobs:
       - name: Set Variables
         id: vars
         run: |
-          # Extract python subversions
+          # Extract python subversion
           PYTHON_MAJOR=$(echo $PYTHON | sed 's/\.[0-9]\+$//')
           PYTHON_PATCH=$(echo $PYTHON | sed 's/^[0-9]\+\.[0-9]\+\.//')
           
@@ -75,7 +77,7 @@ jobs:
           }
           retry make build PYTHON_MAJOR=${PYTHON_MAJOR} PYTHON_PATCH=${PYTHON_PATCH}
         env:
-          RETRIES: 20
+          RETRIES: 5
 
       - name: Test
         run: |
@@ -93,7 +95,7 @@ jobs:
           }
           retry make test PYTHON_MAJOR=${PYTHON_MAJOR} PYTHON_PATCH=${PYTHON_PATCH}
         env:
-          RETRIES: 20
+          RETRIES: 5
 
       - name: Tag
         run: |
@@ -116,7 +118,7 @@ jobs:
           }
           retry make login DOCKER_USER=${{ secrets.DOCKER_USERNAME }} DOCKER_PASS=${{ secrets.DOCKER_PASSWORD }}
         env:
-          RETRIES: 20
+          RETRIES: 5
         # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
         if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
             && (
@@ -143,7 +145,7 @@ jobs:
           }
           retry make push TAG=${TAG}
         env:
-          RETRIES: 20
+          RETRIES: 5
         # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
         if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
             && (

diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ TAG = latest
 JENKINS_SLAVE = 4.13.3-1-jdk11
 
 # Python versions: $PYTHON_MAJOR.PYTHON_PATCH
-PYTHON_MAJOR = 3.7
-PYTHON_PATCH = 9
+PYTHON_MAJOR = 3.11
+PYTHON_PATCH = 1
 
 pull:
 	docker pull $(shell grep FROM Dockerfile | sed 's/^FROM//g' | sed "s/\$${JENKINS_SLAVE}/$(JENKINS_SLAVE)/g";)