Merge remote-tracking branch 'origin/master' into is-12

sony · Sep 25, 2023 · c1a9aca · c1a9aca
2 parents 1bd7283 + b5c8d2e
commit c1a9aca
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 16 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -576,16 +576,28 @@ jobs:
         apt-get update -q
         apt-get install -y software-properties-common
         apt-get --allow-unauthenticated update -q
-        apt-get --allow-unauthenticated install -y curl g++ git make patch zlib1g-dev libssl-dev bsdmainutils dnsutils unzip libffi-dev
+        apt-get --allow-unauthenticated install -y curl g++ git make patch zlib1g-dev libssl-dev bsdmainutils dnsutils unzip
         # ubuntu-14.04 ca-certificates are out of date
         git config --global http.sslVerify false
-        curl -sS https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tar.xz | tar -xJ
-        cd Python-3.8.0
-        ./configure
+        # build and install openssl
+        curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz
+        tar xzf openssl-1.1.1v.tar.gz
+        cd openssl-1.1.1v
+        ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl
+        make -j1 depend
+        make -j8
+        make install_sw
+        cd ..
+        # install ffi.h, which is required for python build
+        apt install libffi-dev
+        # build and install python
+        curl -sSk https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz | tar -xJ
+        cd Python-3.11.5
+        ./configure -C --with-openssl=/usr/local/custom-openssl --with-openssl-rpath=auto
         make -j8
         make install
-        update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.8 3
-        ln -s /usr/local/bin/python3.8 /usr/bin/python
+        update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.11 3
+        ln -s /usr/local/bin/python3.11 /usr/bin/python
         curl -sS https://bootstrap.pypa.io/pip/3.6/get-pip.py | python
         curl -sS https://nodejs.org/dist/v12.16.2/node-v12.16.2-linux-x64.tar.xz | tar -xJ
         echo "`pwd`/node-v12.16.2-linux-x64/bin" >> $GITHUB_PATH
@@ -1063,8 +1075,8 @@ jobs:
 
     - name: make badges
       run: |
-        # combine badges from all builds, exclude macos-11
-        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11
+        # combine badges from all builds, exclude macos-11 and ubuntu-14.04
+        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11 ubuntu-14.04
 
         # force push to github onto an orphan 'badges' branch
         cd ${{ github.workspace }}

diff --git a/.github/workflows/src/build-test.yml b/.github/workflows/src/build-test.yml
@@ -126,16 +126,28 @@ jobs:
         apt-get update -q
         apt-get install -y software-properties-common
         apt-get --allow-unauthenticated update -q
-        apt-get --allow-unauthenticated install -y curl g++ git make patch zlib1g-dev libssl-dev bsdmainutils dnsutils unzip libffi-dev
+        apt-get --allow-unauthenticated install -y curl g++ git make patch zlib1g-dev libssl-dev bsdmainutils dnsutils unzip
         # ubuntu-14.04 ca-certificates are out of date
         git config --global http.sslVerify false
-        curl -sS https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tar.xz | tar -xJ
-        cd Python-3.8.0
-        ./configure
+        # build and install openssl
+        curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz
+        tar xzf openssl-1.1.1v.tar.gz
+        cd openssl-1.1.1v
+        ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl
+        make -j1 depend
+        make -j8
+        make install_sw
+        cd ..
+        # install ffi.h, which is required for python build
+        apt install libffi-dev
+        # build and install python
+        curl -sSk https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz | tar -xJ
+        cd Python-3.11.5
+        ./configure -C --with-openssl=/usr/local/custom-openssl --with-openssl-rpath=auto
         make -j8
         make install
-        update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.8 3
-        ln -s /usr/local/bin/python3.8 /usr/bin/python
+        update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.11 3
+        ln -s /usr/local/bin/python3.11 /usr/bin/python
         curl -sS https://bootstrap.pypa.io/pip/3.6/get-pip.py | python
         curl -sS https://nodejs.org/dist/v12.16.2/node-v12.16.2-linux-x64.tar.xz | tar -xJ
         echo "`pwd`/node-v12.16.2-linux-x64/bin" >> $GITHUB_PATH
@@ -163,8 +175,8 @@ jobs:
 
     - name: make badges
       run: |
-        # combine badges from all builds, exclude macos-11
-        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11
+        # combine badges from all builds, exclude macos-11 and ubuntu-14.04
+        ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11 ubuntu-14.04
 
         # force push to github onto an orphan 'badges' branch
         cd ${{ github.workspace }}