diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ffa4e6..a2d5bde 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,11 +2,9 @@ name: guppy build on: push: - branches: [ "dev", "main" ] + branches: [ "develop", "main" ] tags: - "*" - pull_request: - branches: [ "main" ] permissions: contents: write diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..c250de5 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,113 @@ +name: validate pull request + +on: + pull_request: + branches: [ "main", "develop" ] + +jobs: + build: + strategy: + matrix: + include: + - arch: mips-linux-gnu- + theme: zbolt + small: false + rotate: true + calibrate: false + asset: guppyscreen-zbolt + + - arch: mips-linux-gnu- + theme: material + small: false + rotate: true + calibrate: false + asset: guppyscreen + + - arch: mips-linux-gnu- + theme: material + small: true + rotate: false + calibrate: true + asset: guppyscreen-smallscreen + + - arch: aarch64-none-linux-gnu- + theme: material + small: false + rotate: false + calibrate: true + asset: guppyscreen-arm + + runs-on: ubuntu-22.04 + container: + image: ballaswag/guppydev:latest + options: --user 1001 + + env: + CROSS_COMPILE: ${{ matrix.arch }} + CC: ${{ matrix.arch }} + CXX: ${{ matrix.arch }} + GUPPY_THEME: ${{ matrix.theme }} + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: set guppyscreen version + run: | + echo "GUPPYSCREEN_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV + + - if: matrix.small + name: export screen size + run: | + echo "GUPPY_SMALL_SCREEN=${{ matrix.small }}" >> $GITHUB_ENV + + - if: matrix.rotate + name: export screen rotate + run: | + echo "GUPPY_ROTATE=${{ matrix.rotate }}" >> $GITHUB_ENV + + - if: matrix.calibrate + name: export touch calibrate + run: | + echo "EVDEV_CALIBRATE=${{ matrix.calibrate }}" >> $GITHUB_ENV + + - name: patch lv_drivers + run: | + git apply ../patches/0001-lv_driver_fb_ioctls.patch + working-directory: ./lv_drivers + + - name: patch fmt in spdlog + run: | + git apply ../patches/0002-spdlog_fmt_initializer_list.patch + working-directory: ./spdlog + + - name: patch dpi text scale in lvgl + run: | + git apply ../patches/0003-lvgl-dpi-text-scale.patch + working-directory: ./lvgl + + - name: make wpaclient + run: make wpaclient + + - name: make libhv + run: make libhv.a + + - name: make libspdlog + run: make libspdlog.a + + - name: make guppyscreen + run: make -j + + - name: make kd_graphic_mode + run: make kd_graphic_mode + + - name: package release + run: | + chmod +x ./release.sh + ./release.sh ${{ matrix.asset }} + + - uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.asset }} + path: ./${{ matrix.asset }}.tar.gz diff --git a/debian/guppyscreen.service b/debian/guppyscreen.service index 1ee64ba..052cda1 100644 --- a/debian/guppyscreen.service +++ b/debian/guppyscreen.service @@ -7,9 +7,9 @@ StartLimitIntervalSec=0 Type=simple Restart=always RestartSec=1 -User=biqu -WorkingDirectory=/home/biqu/guppyscreen -ExecStart="/home/biqu/guppyscreen/guppyscreen" +User= +WorkingDirectory=/home//guppyscreen +ExecStart="/home//guppyscreen/guppyscreen" [Install] WantedBy=multi-user.target diff --git a/installer-deb.sh b/installer-deb.sh index 3b05cf4..a767248 100755 --- a/installer-deb.sh +++ b/installer-deb.sh @@ -47,6 +47,8 @@ get_klipper_paths() { } install_services() { + sed -i "s||$USER|g" ${HOME}/guppyscreen/debian/guppyscreen.service + sudo cp ${HOME}/guppyscreen/debian/disable_blinking_cursor.service /etc/systemd/system sudo cp ${HOME}/guppyscreen/debian/guppyscreen.service /etc/systemd/system sudo systemctl enable disable_blinking_cursor.service