Move from Ubuntu 16.04 -> 18.04

C++17 required, Ubuntu 16.04 EOL
nodegit · Nov 8, 2022 · 4f6db56 · 4f6db56
1 parent bb19995
commit 4f6db56
Showing 1 changed file with 2 additions and 20 deletions.
diff --git a/.github/workflows/rebuildElectron.yml b/.github/workflows/rebuildElectron.yml
@@ -11,31 +11,17 @@ jobs:
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
-    container: ubuntu:16.04
+    container: ubuntu:18.04
     steps:
       - name: Print Tag Ref
         run: echo ${{ github.ref }}
 
       - name: Install Dependencies for Ubuntu
         # git >= 2.18 required for actions/checkout git support
-        run: apt update && apt install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt update && apt install -y git wget build-essential clang python3 libkrb5-dev libc++-dev zlib1g-dev
+        run: apt update && apt install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt update && apt install -y git wget build-essential clang python3 libkrb5-dev libc++-dev zlib1g-dev libssl-dev
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
-      - name: Setup python 3.6
-        env:
-          CC: clang
-          CXX: clang++
-        run: |
-          mkdir ~/python
-          cd ~/python
-          wget https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tgz
-          tar -xvf Python-3.6.15.tgz
-          cd Python-3.6.15
-          ./configure
-          make
-          make install
-
       - uses: actions/checkout@v2
 
       - name: Use Node.js 12.x
@@ -50,10 +36,6 @@ jobs:
       - name: Set npm config
         run: npm config set unsafe-perm true
 
-      # 16.04 comes with 1.0.2
-      - name: Install OpenSSL 1.1.1s
-        run: sh -c 'cd /tmp && wget https://www.openssl.org/source/openssl-1.1.1s.tar.gz && wget https://www.openssl.org/source/openssl-1.1.1s.tar.gz.sha256 && echo "$(cat openssl-1.1.1s.tar.gz.sha256) openssl-1.1.1s.tar.gz" | sha256sum -c && tar xvf openssl-1.1.1s.tar.gz && cd openssl-1.1.1s && ./config no-ssl2 no-ssl3 no-comp && make && make test && make install'
-
       - run: git config --global --add safe.directory /__w/electron-npg-automator/electron-npg-automator
       - run: npm install
       - run: npm run compile