Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ on:
branches: [ main, develop ]
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu:24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kernel_build.sh
Expand All @@ -31,12 +31,12 @@ jobs:
shell: bash

run-kernel-module-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Test Install
run: ./tests/test_kernel_install.sh
Expand All @@ -49,25 +49,25 @@ jobs:
shell: bash

run-kernel-dkms-install-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kenel_dkms_install.sh || true
shell: bash

run-tests:
name: Run Tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Check out Git repository
uses: actions/checkout@v4
- name: Install Development Dependencies
run: ./deploy/dependencies/install_development_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_development_dependencies_ubuntu_24_04.sh
shell: bash
- name: Lint with Linux checkpath
if: always()
Expand All @@ -92,7 +92,7 @@ jobs:

check-kernel-module-change:
needs: [build, run-kernel-module-test, run-kernel-dkms-install-test, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
output1: ${{ steps.filter.outputs.workflows }}
steps:
Expand All @@ -106,7 +106,7 @@ jobs:

release-kernel-patch:
needs: [check-kernel-module-change]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:

test-in-docker-container:
needs: [build, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -175,7 +175,7 @@ jobs:
shell: bash

test-packages:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build_PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
branches: [ main ]
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kernel_build.sh
Expand All @@ -20,12 +20,12 @@ jobs:
shell: bash

run-kernel-module-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Test Install
run: ./tests/test_kernel_install.sh
Expand All @@ -38,25 +38,25 @@ jobs:
shell: bash

run-kernel-dkms-install-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kenel_dkms_install.sh || true
shell: bash

run-tests:
name: Run Tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Check out Git repository
uses: actions/checkout@v4
- name: Install Development Dependencies
run: ./deploy/dependencies/install_development_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_development_dependencies_ubuntu_24_04.sh
shell: bash
- name: Lint with Linux checkpath
if: always()
Expand All @@ -81,7 +81,7 @@ jobs:

check-kernel-module-change:
needs: [build, run-kernel-module-test, run-kernel-dkms-install-test, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
output1: ${{ steps.filter.outputs.workflows }}
steps:
Expand All @@ -95,7 +95,7 @@ jobs:

release-kernel-patch:
needs: [check-kernel-module-change]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -107,7 +107,7 @@ jobs:

test-in-docker-container:
needs: [build, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/extra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kernel_build.sh
Expand All @@ -18,7 +18,7 @@ jobs:
run: ./tests/test_kernel_install.sh
shell: bash
test-ci-env:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Setup upterm session
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/manual_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kernel_build.sh
Expand All @@ -29,12 +29,12 @@ jobs:
shell: bash

run-kernel-module-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Test Install
run: ./tests/test_kernel_install.sh
Expand All @@ -47,25 +47,25 @@ jobs:
shell: bash

run-kernel-dkms-install-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Dependencies
run: ./deploy/dependencies/install_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
shell: bash
- name: Build
run: ./tests/test_kenel_dkms_install.sh || true
shell: bash

run-tests:
name: Run Tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Check out Git repository
uses: actions/checkout@v4
- name: Install Development Dependencies
run: ./deploy/dependencies/install_development_dependencies_ubuntu.sh
run: ./deploy/dependencies/install_development_dependencies_ubuntu_24_04.sh
shell: bash
- name: Lint with Linux checkpath
if: always()
Expand All @@ -91,7 +91,7 @@ jobs:
# Use to test kernel patch build if needed
release-kernel-patch:
needs: [build, run-kernel-module-test, run-kernel-dkms-install-test, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.event.inputs.BUILD_KERNEL_PATCH == 'true' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -103,7 +103,7 @@ jobs:

test-in-docker-container:
needs: [build, run-tests]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions deploy/Dockerfile.ubuntu → deploy/Dockerfile.ubuntu.22.04
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ RUN apt-get install -y gcc-12
RUN mkdir /opt/LinuxLegionLaptop
WORKDIR /opt/LinuxLegionLaptop

COPY ./deploy/dependencies/install_dependencies_ubuntu.sh ./deploy/dependencies/install_dependencies_ubuntu.sh
RUN deploy/dependencies/install_dependencies_ubuntu.sh
COPY ./deploy/dependencies/install_dependencies_ubuntu_22_04.sh ./deploy/dependencies/install_dependencies_ubuntu_22_04.sh
RUN ./deploy/dependencies/install_dependencies_ubuntu_22_04.sh

COPY ./deploy/dependencies ./deploy/dependencies
RUN deploy/dependencies/install_development_dependencies_ubuntu.sh
RUN ./deploy/dependencies/install_development_dependencies_ubuntu_22_04.sh

COPY . /opt/LinuxLegionLaptop

Expand Down
38 changes: 38 additions & 0 deletions deploy/Dockerfile.ubuntu.24.04
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM ubuntu:24.04
ARG DEBIAN_FRONTEND=noninteractive

# Install sudo (used in scripts that are tested)
RUN apt-get update && \
apt-get -y install sudo

# Set timezone (used by pylint) and locale
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
RUN ln -snf /usr/share/zoneinfo/US/Central /etc/localtime && echo US/Central > /etc/timezone && \
apt-get -y install locales tzdata && \
sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen


RUN apt-get install -y gcc-12

RUN mkdir /opt/LinuxLegionLaptop
WORKDIR /opt/LinuxLegionLaptop

COPY ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh
RUN ./deploy/dependencies/install_dependencies_ubuntu_24_04.sh

COPY ./deploy/dependencies ./deploy/dependencies
RUN ./deploy/dependencies/install_development_dependencies_ubuntu_24_04.sh

COPY . /opt/LinuxLegionLaptop

RUN tests/test_kernel_build.sh \
&& tests/test_kernel_install.sh
RUN tests/test_python_cli.sh
# && tests/test_python_gui.sh
RUN deploy/python_install_pip_pkg.sh \
&& tests/test_python_cli_installed.sh
# && tests/test_python_gui_installed.sh
#RUN tests/test_python_run_gui_root.sh
5 changes: 5 additions & 0 deletions deploy/dependencies/install_dependencies_ubuntu_24_04.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -ex
sudo apt-get update
sudo apt-get install -y make gcc clang linux-headers-$(uname -r) build-essential git lm-sensors wget python3-pyqt6 python3-yaml python3-venv python3-pip python3-wheel python3-argcomplete policykit-1
sudo apt-get install -y dkms openssl mokutil
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ sudo apt-get -y -qq install \

sudo pip install pyqt6-tools PyQt6

${DIR}/install_dependencies_ubuntu.sh
${DIR}/install_dependencies_ubuntu_22_04.sh
${DIR}/linux_kernel/install_checkpath.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
set -ex
DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

# Needed in CI
sudo apt-get update

# Linter
# Tools for running GUI tests headless
sudo apt-get -y -qq install \
wget \
pylint python3-venv python3-pip python3-build \
python3-installer xvfb libxcb-xinerama0 pyqt6-dev-tools

${DIR}/install_dependencies_ubuntu_24_04.sh
${DIR}/linux_kernel/install_checkpath.sh
8 changes: 6 additions & 2 deletions deploy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ services:
# build:
# context: ..
# dockerfile: deploy/Dockerfile.suse
legion-ubuntu:
# legion-ubuntu-22-04:
# build:
# context: ..
# dockerfile: deploy/Dockerfile.ubuntu.22.04
legion-ubuntu-24-04:
build:
context: ..
dockerfile: deploy/Dockerfile.ubuntu
dockerfile: deploy/Dockerfile.ubuntu.24.04
ubuntu:
image: ubuntu:latest
volumes:
Expand Down
Loading