From ef02e8af89c239026f772a4ae0729acc6e289a6e Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 9 Nov 2024 14:51:31 +0000 Subject: [PATCH] wip --- .github/workflows/build.yml | 28 +++++++++++----------------- docker/Dockerfile | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b4091b..bfe2fb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: true matrix: os: - - ubuntu-latest + - self-hosted # - windows-latest # - macos-latest @@ -37,17 +37,6 @@ jobs: if: ${{ runner.os == 'Windows' }} uses: ilammy/msvc-dev-cmd@v1 - - name: Install dependencies on Ubuntu - if: ${{ runner.os == 'Linux' }} - run: | - sudo apt update -qq - sudo apt install libgtk-3-dev libglib2.0-dev ninja-build lld xvfb -y - - - uses: subosito/flutter-action@v2 - with: - flutter-version: '3.24.0' - channel: 'stable' - - name: Checkout qt-embedder uses: actions/checkout@v4 @@ -65,8 +54,13 @@ jobs: - name: debug run: | flutter --version + dart --version which flutter which dart + ls $FLUTTER_ENGINE_FOLDER + echo "WORKSPACE: ${{ github.workspace }}" + env: + FLUTTER_ENGINE_FOLDER: ${{ github.workspace }}/3rdparty/flutter/ - name: Fix embedder header run: cp 3rdparty/flutter/shell/platform/embedder/embedder.h 3rdparty/flutter/shell/platform/embedder/flutter_embedder.h @@ -88,8 +82,8 @@ jobs: env: FLUTTER_ENGINE_FOLDER: ${{ github.workspace }}/3rdparty/flutter/ - # - name: Build example - # run: | - # ./build_example.sh - # env: - # FLUTTER_ENGINE_FOLDER: ${{ github.workspace }}/3rdparty/flutter/ + - name: Build example + run: | + ./build_example.sh + env: + FLUTTER_ENGINE_FOLDER: ${{ github.workspace }}/3rdparty/flutter/ diff --git a/docker/Dockerfile b/docker/Dockerfile index 6e70ebf..971d193 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,9 +8,14 @@ # Docker container for building the engine and testing qt-flutter-embedder # in CI +# docker build --build-arg GITHUB_RUNNER_TOKEN=$GITHUB_RUNNER_TOKEN -t qt-flutter-embedder . +# docker run -it qt-flutter-embedder /home/ubuntu/actions-runner/run.sh + FROM ubuntu:24.10 MAINTAINER Sergio Martins (sergio.martins@kdab.com) +ARG GITHUB_RUNNER_TOKEN + ENV TZ=Europe/Berlin ENV LC_CTYPE=C.UTF-8 # ENV LD_LIBRARY_PATH=/Qt5/lib/:/Qt6/lib/ @@ -45,3 +50,16 @@ git fetch sergio && \ git checkout sergio/main && gclient sync -D RUN cd $FLUTTER_ENGINE_FOLDER && ./build.sh && cp ./shell/platform/embedder/embedder.h ./shell/platform/embedder/flutter_embedder.h + +# Install GitHub Actions runner + +RUN mkdir actions-runner && cd actions-runner && \ + curl -o actions-runner-linux-x64-2.320.0.tar.gz -L https://github.com/actions/runner/releases/download/v2.320.0/actions-runner-linux-x64-2.320.0.tar.gz && \ + echo "93ac1b7ce743ee85b5d386f5c1787385ef07b3d7c728ff66ce0d3813d5f46900 actions-runner-linux-x64-2.320.0.tar.gz" | shasum -a 256 -c && \ + tar xzf ./actions-runner-linux-x64-2.320.0.tar.gz && \ + ./config.sh --url https://github.com/KDABLabs/qt-flutter-embedder --token $GITHUB_RUNNER_TOKEN + +# More dependencies, TODO: move up! +USER root +RUN apt install xvfb -y +USER ubuntu