From 7712acff64a841575d1e480629eaf60854bb787d Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Sun, 5 May 2024 18:35:38 -0700 Subject: [PATCH] Use `actions/setup-python` for Ubuntu also --- .github/workflows/ubuntu.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2ce8b33e7..dd0d5d57b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -22,6 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -29,11 +33,7 @@ jobs: run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -52,6 +52,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -59,11 +63,7 @@ jobs: run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: make clean run: make clean @@ -83,6 +83,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Update apt repos run: sudo apt-get update @@ -90,11 +94,7 @@ jobs: run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev - name: Install Python dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install setuptools - python3 -m pip install ansicolors sslcrypto - if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi + run: pip install -r tools/requirements.txt - name: Prepare Build Folders run: |