Skip to content

deshenaniganize #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

deshenaniganize #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8a41d6
deshenaniganize
graebm Dec 8, 2022
45f3a13
"python3" on ubuntu always
graebm Dec 8, 2022
a2ea329
gcc 12
graebm Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/docker-images/ubuntu-18-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ RUN apt-get update -qq \
curl \
sudo \
unzip \
# Ubuntu18's default python3 is python3.6, which is EOL.
# So install python3.8 (latest version on this distro, circa Oct 2022)
python3.8-dev \
# This installs pip for all python versions on the system
# (there is no "python3.8-pip")
# Don't bother installing a specific python version. "python3" will always
# refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
python3-dev \
python3-pip \
build-essential \
# For PPAs
Expand All @@ -29,8 +27,8 @@ RUN apt-get update -qq \
###############################################################################
WORKDIR /tmp

RUN python3.8 -m pip install setuptools \
&& python3.8 -m pip install --upgrade pip \
RUN python3 -m pip install setuptools \
&& python3 -m pip install --upgrade pip \
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscliv2.zip \
&& unzip awscliv2.zip \
&& sudo aws/install \
Expand Down
3 changes: 2 additions & 1 deletion .github/docker-images/ubuntu-20-aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ RUN apt-get update -qq \
curl \
sudo \
unzip \
python3 \
# Don't bother installing a specific python version. "python3" will always
# refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
python3-dev \
python3-pip \
build-essential \
Expand Down
2 changes: 2 additions & 0 deletions .github/docker-images/ubuntu-20-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ RUN apt-get update -qq \
curl \
sudo \
unzip \
# Don't bother installing a specific python version. "python3" will always
# refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
python3-dev \
python3-pip \
build-essential \
Expand Down
4 changes: 1 addition & 3 deletions builder/core/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ class PKG_TOOLS(Enum):
],
'pkg_update': 'apt-get -qq update -y',
'pkg_install': 'apt-get -qq install -y',
'variables': {
'python': "python3.8",
},
},
'debian': {
'os': 'linux',
Expand Down Expand Up @@ -532,6 +529,7 @@ class PKG_TOOLS(Enum):
'9': {},
'10': {},
'11': {},
'12': {},
},

'architectures': {
Expand Down