From 8a57f52ffcceb5f39b07e9e1eb799bb3c7261848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Eustace?= <sebastien@eustace.io>
Date: Thu, 4 Mar 2021 11:27:12 +0100
Subject: [PATCH] Fix build scripts

---
 .cirrus.yml                   | 2 +-
 .github/workflows/release.yml | 6 +++---
 Makefile                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2b5f507c6ad..c95db272ed6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,7 +37,7 @@ release_task:
     PYTHON38: python3.8
   freebsd_instance:
     matrix:
-      - image_family: freebsd-12-1-snap
+      - image_family: freebsd-12-2
       - image_family: freebsd-13-0-snap
       - image_family: freebsd-11-4-snap
   python_script: pkg install -y curl bash jq python3 python27 python36 python37 python38
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 43e7d357cd1..28acd05aecb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,13 +53,13 @@ jobs:
         poetry install --no-dev
     - name: Preparing Python executables
       run: |
-        curl -L https://github.com/sdispater/python-binaries/releases/download/2.7.17/python-2.7.17.macos.tar.xz -o python-2.7.17.tar.xz
+        curl -L https://github.com/sdispater/python-binaries/releases/download/2.7.18/python-2.7.18.macos.tar.xz -o python-2.7.18.tar.xz
         curl -L https://github.com/sdispater/python-binaries/releases/download/3.5.9/python-3.5.9.macos.tar.xz -o python-3.5.9.tar.xz
         curl -L https://github.com/sdispater/python-binaries/releases/download/3.6.8/python-3.6.8.macos.tar.xz -o python-3.6.8.tar.xz
         curl -L https://github.com/sdispater/python-binaries/releases/download/3.7.6/python-3.7.6.macos.tar.xz -o python-3.7.6.tar.xz
         curl -L https://github.com/sdispater/python-binaries/releases/download/3.8.3/python-3.8.3.macos.tar.xz -o python-3.8.3.tar.xz
         curl -L https://github.com/sdispater/python-binaries/releases/download/3.9.0b4/python-3.9.0b4.macos.tar.xz -o python-3.9.0b4.tar.xz
-        tar -zxf python-2.7.17.tar.xz
+        tar -zxf python-2.7.18.tar.xz
         tar -zxf python-3.5.9.tar.xz
         tar -zxf python-3.6.8.tar.xz
         tar -zxf python-3.7.6.tar.xz
@@ -68,7 +68,7 @@ jobs:
     - name: Build specific release
       run: |
         source $HOME/.poetry/env
-        poetry run python sonnet make release --ansi -P "2.7:python-2.7.17/bin/python" -P "3.5:python-3.5.9/bin/python" -P "3.6:python-3.6.8/bin/python" -P "3.7:python-3.7.6/bin/python" -P "3.8:python-3.8.3/bin/python" -P "3.9:python-3.9.0b4/bin/python"
+        poetry run python sonnet make release --ansi -P "2.7:python-2.7.18/bin/python" -P "3.5:python-3.5.9/bin/python" -P "3.6:python-3.6.8/bin/python" -P "3.7:python-3.7.6/bin/python" -P "3.8:python-3.8.3/bin/python" -P "3.9:python-3.9.0b4/bin/python"
     - name: Upload release file
       uses: actions/upload-artifact@v1
       with:
diff --git a/Makefile b/Makefile
index 4633517e587..f8a9ffb361b 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ wheel:
 	@poetry build -v
 
 linux_release:
-	docker pull quay.io/pypa/manylinux2010_x86_64
+	docker pull quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
 	docker run --rm -i -v `pwd`:/io \
 		-e PYTHON=/opt/python/cp38-cp38/bin/python \
 		-e PYTHON27=/opt/python/cp27-cp27m/bin/python \
@@ -56,7 +56,7 @@ linux_release:
 		-e PYTHON37=/opt/python/cp37-cp37m/bin/python \
 		-e PYTHON38=/opt/python/cp38-cp38/bin/python \
 		-e PYTHON39=/opt/python/cp39-cp39/bin/python \
-		quay.io/pypa/manylinux2010_x86_64 sh -c "cd /io && ./make-nix-release.sh"
+		quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5 sh -c "cd /io && ./make-nix-release.sh"
 
 # run tests against all supported python versions
 tox: