Skip to content

Commit 9037f4e

Browse files
committed
CircleCI: moved to rmbuilder:x64-build
1 parent 000a199 commit 9037f4e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.circleci/config.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ commands:
1515
- run:
1616
name: Install dependencies
1717
command: |
18-
sudo ./opt/readies/bin/getpy
19-
sudo ./opt/system-setup.py
18+
./opt/readies/bin/getpy
19+
./opt/system-setup.py
2020
git clone git://github.com/antirez/redis.git --branch 5.0.5
21-
(cd redis && make malloc=libc -j $(nproc) && sudo make install)
21+
(cd redis && make malloc=libc -j $(nproc) && make install)
2222
./get_deps.sh cpu
2323
- save_cache:
2424
paths:
@@ -63,9 +63,7 @@ commands:
6363
jobs:
6464
build:
6565
docker:
66-
- image: circleci/python:3.7.4-buster
67-
environment:
68-
DEPS: ""
66+
- image: redisfab/rmbuilder:x64-buster
6967
steps:
7068
- ci_steps:
7169
platform: debian

opt/readies/paella/files.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
from contextlib import contextmanager
33
import os
44

5-
def fread(fname, mode = 'rb'):
5+
def fread(fname, mode='rb'):
66
with open(fname, mode) as file:
77
return file.read()
88

9+
def fwrite(fname, text, mode='w'):
10+
with open(fname, mode) as file:
11+
return file.write(text)
12+
913
def flines(fname, mode = 'rb'):
1014
return [line.rstrip() for line in open(fname)]
1115

opt/readies/paella/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def pip3_install(self, cmd, _try=False):
199199
self.run("pip3 install --disable-pip-version-check " + pip_user + cmd, output_on_error=True, _try=_try)
200200

201201
def setup_pip(self):
202-
get_pip = "set -e; wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py"
202+
get_pip = "set -e; wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py"
203203
if not self.has_command("pip3"):
204204
self.install("python3-distutils", _try=True)
205205
self.install_downloaders()

0 commit comments

Comments
 (0)