fix(ci): build front-end before doc and sdk

.gitea/workflows/build-bin.yml

@@ -0,0 +1,33 @@
+name: Building AntOS binaries
+on:
+  workflow_call:
+    inputs:
+      platform:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ci-tools
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Update submodule
+        run: git submodule update --init
+      - name: Building binaries for platform - ${{ inputs.platform }}
+        run: |
+          mkdir build
+          DESTDIR=$(realpath build) \
+                    ARCH=${{ inputs.platform }} \
+                    RUSTUP_HOME=/opt/rust/rustup \
+                    CARGO_HOME=/opt/rust/cargo \
+                    make all deb appimg
+      - name: Checking binaries
+        run: ./scripts/ckarch.sh build
+      - name: Save artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-${{ inputs.platform }}
+          path: build/
+          retention-days: 5
+      - run: echo "Build is ${{ job.status }}."

.gitea/workflows/ci.yml

@@ -0,0 +1,93 @@
+name: AntOS pipeline
+run-name: Building AntOS binaries
+on: [push]
+
+jobs:
+  build-amd64:
+    uses: ./.gitea/workflows/build-bin.yml
+    with:
+      platform: amd64
+  build-arm64:
+    uses: ./.gitea/workflows/build-bin.yml
+    with:
+      platform: arm64
+
+  build-arm:
+    uses: ./.gitea/workflows/build-bin.yml
+    with:
+      platform: arm
+
+  publish-doc-on-tag:
+    runs-on: act-runner
+    if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
+    needs:
+    container:
+      image: iohubdev/ci-tools:latest
+      volumes:
+        - /opt/public/antos-release/:/public/
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Update submodule
+        run: git submodule update --init
+      - run: mkdir -p build
+      - name: Build and publish doc and SDK
+        run: |
+          make frontend
+          DOCDIR=/public/doc/ make doc
+          SDKDIR=/public/sdk/ make sdk
+  
+  publish-package-on-tag:
+    runs-on: act-runner
+    if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
+    needs: [build-amd64, build-arm64, build-arm]
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: mkdir -p build
+      - name: get build-amd64 artifacts
+        uses: actions/download-artifact@master
+        with:
+          name: build-amd64
+          path: build
+      - name: get build-arm64 artifacts
+        uses: actions/download-artifact@master
+        with:
+          name: build-arm64
+          path: build
+      - name: get build-arm artifacts
+        uses: actions/download-artifact@master
+        with:
+          name: build-arm
+          path: build
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+      - name: Login to DockerHub
+        uses: docker/login-action@master
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PAT }}
+      - name: Env
+        run: |
+          printenv
+          docker info
+          ls . -al
+          ls build/ -al
+      - name: Build and push docker image
+        run: |
+          PKG_VERSION="${{ gitea.ref_name }}"
+          DOCKER_TAG=$PKG_VERSION DOCKER_IMAGE=iohubdev/antos make docker
+      - name: Publish packages
+        run: |
+          rm build/*/opt/ -rf
+          files=$(find ./build -type f)
+          PKG_VERSION="${{ gitea.ref_name }}"
+          URL="https://git.iohub.dev/api/packages/dany/generic/antos/$PKG_VERSION"
+          curl --request "DELETE" --header "Authorization: token ${{ secrets.GT_API_PAT }}" $URL/ || true
+          for file in $files; do
+            curl --header "Authorization: token ${{ secrets.GT_API_PAT }}" --upload-file $file $URL/$(basename $file)
+          done

BUILD.md

@@ -29,7 +29,11 @@ Work in progress
     git wget curl 
 ```
 
-Rust
+### Rust
+
+```sh
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+```
 rustup default stable
 
 Install cross toolchain
@@ -52,7 +56,7 @@ libssl libsqlite3 zlib1g libreadline libvncclient1 libjpeg-turbo8
 ## Build
 ```
 git submodule update --init
-make
+CARGO_HOME=~/.cargo make
 
 # build docker (WIP)
 make docker

Jenkinsfile

@@ -1,134 +0,0 @@
-pipeline {
-    agent {
-        node { label'workstation' }
-    }
-    options {
-        // Limit build history with buildDiscarder option:
-        // daysToKeepStr: history is only kept up to this many days.
-        // numToKeepStr: only this many build logs are kept.
-        // artifactDaysToKeepStr: artifacts are only kept up to this many days.
-        // artifactNumToKeepStr: only this many builds have their artifacts kept.
-        buildDiscarder(logRotator(numToKeepStr: '1'))
-        // Enable timestamps in build log console
-        timestamps()
-        // Maximum time to run the whole pipeline before canceling it
-        timeout(time: 3, unit: 'HOURS')
-        // Use Jenkins ANSI Color Plugin for log console
-        ansiColor('xterm')
-        // Limit build concurrency to 1 per branch
-        disableConcurrentBuilds()
-    }
-    stages
-    {
-        stage('Prepare dependencies') {
-            steps {
-                sh'''
-                cd antd/luasocket && git stash || true
-                cd $WORKSPACE
-                git submodule update --init
-                make clean || true
-                rm -rf build/* || true
-                mkdir build || true
-                '''
-            }
-        }
-        stage('Build AMD64)') {
-            agent {
-                docker {
-                    image 'xsangle/ci-tools:latest'
-                    reuseNode true
-                    args ' --device /dev/fuse --privileged '
-                }
-            }
-            steps {
-                sh'''
-                DESTDIR=$(realpath build) \
-                    ARCH=amd64 \
-                    RUSTUP_HOME=/opt/rust/rustup \
-                    CARGO_HOME=/opt/rust/cargo \
-                    make all deb appimg
-                '''
-            }
-        }
-        stage('Build ARM64)') {
-            agent {
-                docker {
-                    image 'xsangle/ci-tools:latest'
-                    reuseNode true
-                    args ' --device /dev/fuse --privileged '
-                }
-            }
-            steps {
-                sh'''
-                DESTDIR=$(realpath build) \
-                    ARCH=arm64 \
-                    RUSTUP_HOME=/opt/rust/rustup \
-                    CARGO_HOME=/opt/rust/cargo \
-                    make all deb appimg
-                '''
-            }
-        }
-        stage('Build ARM)') {
-            agent {
-                docker {
-                    image 'xsangle/ci-tools:latest'
-                    reuseNode true
-                    args ' --device /dev/fuse --privileged '
-                }
-            }
-            steps {
-                sh'''
-                DESTDIR=$(realpath build) \
-                    ARCH=arm \
-                    RUSTUP_HOME=/opt/rust/rustup \
-                    CARGO_HOME=/opt/rust/cargo \
-                    make all deb appimg
-                '''
-            }
-        }
-        stage('Checking build)') {
-            steps {
-                sh'''
-                ./scripts/ckarch.sh build
-                '''
-            }
-        }
-        stage('Build docker') {
-            steps {
-                script {
-                    if (env.TAG_NAME) {
-                        sh'''
-                        DOCKER_TAG=$TAG_NAME DOCKER_IMAGE=iohubdev/antos make docker
-                        '''
-                    } else {
-                        echo "Regular commit doing nothing"
-                    }
-                }
-            }
-        }
-        stage('Copy doc') {
-            steps {
-                sh'''
-                DOCDIR=/home/dany/public/antos-release/doc/ make doc
-                SDKDIR=/home/dany/public/antos-release/sdk/ make sdk
-                '''
-            }
-        }
-        stage('Copy Binaries') {
-            steps {
-                sh'''
-                BINDIR="/home/dany/public/antos-release/binaries/"
-                find ./build/ -name "*.deb" -exec install -Dm 755 "{}" "$BINDIR/deb" \\;
-                find ./build/ -name "*.AppImage" -exec install -Dm 755 "{}" "$BINDIR/appimg" \\;
-                '''
-            }
-        }
-        stage('Archive') {
-            steps {
-                script {
-                    archiveArtifacts artifacts: 'build/', fingerprint: true
-                }
-            }
-        }
-    }
-}

Makefile

@@ -5,7 +5,7 @@ DOCKER_TAG?=$(subst master,stable,$(subst refs/heads/,,$(shell git symbolic-ref
 DOCKER_IMAGE?=iohubdev/antos
 
 ARCH?=amd64
-VERSION?=2.1.0-b
+VERSION?=2.1.1-b
 
 RUSTUP_HOME?=/opt/rust
 CARGO_HOME?=/opt/rust/cargo
@@ -202,4 +202,4 @@ sdk:
 	done
 
 # --push 
-.PHONY: antd antos docker
+.PHONY: antd antos docker

README.md

@@ -1,5 +1,6 @@
 # ![https://github.com/antos-rde/antos/raw/master/antos-64.png](https://github.com/antos-rde/antos/raw/master/antos-64.png) antOS v2.0.0
-[![Build Status](https://ci.iohub.dev/buildStatus/icon?job=gitea-sync%2Fantos%2F2.0.x)](https://ci.iohub.dev/buildStatus/icon?job=gitea-sync%2Fantos%2F2.0.x)
+
+![https://git.iohub.dev/dany/antos/actions/workflows/ci.yml/badge.svg?branch=master](https://git.iohub.dev/dany/antos/actions/workflows/ci.yml/badge.svg?branch=master)
 
 AntOS is a web-based remote desktop environment that provides an all-in-one solution for setting up a cloud-based, self-hosted working environment. It features a backend API and services, a front-end web-based window manager, application APIs, a GUI toolkit, and file system abstractions. It also includes an application store and an SDK for in-browser application development, deployment, and packaging. AntOS is designed to work across devices, including desktop computers and mobile devices.
 

docker/antos/Dockerfile

@@ -65,6 +65,7 @@ COPY --from=deploy-env /platform/opt/ /opt/
 
 COPY docker/antos/start.sh /start.sh
 RUN chmod 700 /start.sh
+RUN chmod +x /opt/www/bin/*
 
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/www/lib/"
 ENV PATH="$PATH:/opt/www/bin/"

docker/dev/Dockerfile

@@ -1,7 +1,4 @@
 FROM  debian:bookworm AS deploy-env
-ARG UNAME=ci
-ARG UID=1000
-ARG GID=1000
 
 RUN apt-get update && apt-get --yes --no-install-recommends install \
     build-essential \
@@ -19,11 +16,14 @@ RUN apt-get update && apt-get --yes --no-install-recommends install \
     libffi-dev \
     ca-certificates \
     unzip \
-    libturbojpeg0-dev \
+    libjpeg62-turbo-dev \
     libvncserver-dev \
     lua5.3
+ENV RUSTUP_HOME=/opt/rust/rustup
+ENV CARGO_HOME=/opt/rust/cargo
 
-RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
+RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
+RUN . /opt/rust/cargo/env && rustup default stable
 RUN chmod -R 777 /opt/rust/
 RUN apt-get update && apt-get --yes --no-install-recommends install \
     nodejs npm git wget libfuse2 fuse3
@@ -33,13 +33,17 @@ RUN dpkg --add-architecture armhf
 RUN dpkg --add-architecture arm64
 RUN apt-get update && apt-get --yes --no-install-recommends install \
     crossbuild-essential-armhf \
-    crossbuild-essential-armhf \
+    crossbuild-essential-arm64 \
-    libsqlite3-0:arm64 zlib1g:arm64 libreadline8:arm64 libssl3:arm64 \
+    libsqlite3-dev:arm64 zlib1g-dev:arm64 libreadline-dev:arm64 libssl-dev:arm64 \
-    libffi-dev:arm64 libturbojpeg0:arm64 libvncclient1:arm64 \
+    libffi-dev:arm64 libjpeg62-turbo-dev:arm64 libvncclient1:arm64 \
-    libsqlite3-0:armhf zlib1g:armhf libreadline8:armhf libssl3:armhf \
+    libsqlite3-dev:armhf zlib1g-dev:armhf libreadline-dev:armhf libssl-dev:armhf \
-    libffi-dev:armhf libturbojpeg0:armhf libvncclient1:armhf
+    libffi-dev:armhf libjpeg62-turbo-dev:armhf libvncclient1:armhf
+RUN ln -sf /usr/lib/arm-linux-gnueabihf/libvncclient.so.1 /usr/lib/arm-linux-gnueabihf/libvncclient.so
+RUN ln -sf /usr/lib/aarch64-linux-gnu/libvncclient.so.1 /usr/lib/aarch64-linux-gnu/libvncclient.so
+#RUN ln -sf /usr/lib/arm-linux-gnueabihf/libjpeg.so.62 /usr/lib/arm-linux-gnueabihf/libjpeg.so
+#RUN ln -sf /usr/lib/aarch64-linux-gnu/libjpeg.so.62 /usr/lib/aarch64-linux-gnu/libjpeg.so
 
 RUN groupadd -g 1000 -o ci
 RUN useradd -m -u 1000 -g 1000 -o -s /bin/bash ci
 USER ci
-WORKDIR /home/ci
+WORKDIR /home/ci

scripts/mkdocker.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -x
 
 DOCKER_IMAGE=$1