mirror of
https://github.com/antos-rde/antos.git
synced 2025-07-15 21:39:54 +02:00
Compare commits
18 Commits
2.1.1
...
36c9dce6eb
Author | SHA1 | Date | |
---|---|---|---|
36c9dce6eb | |||
5f8174acd6 | |||
a61d5ddf09 | |||
2cc44c1a11 | |||
3508d61ad6 | |||
236431d4c2 | |||
0bb8c7a122 | |||
6f2a2b799e | |||
85a16f9976 | |||
a72a12f2a7 | |||
ae681eed5c | |||
950ccc67d2 | |||
b39310b35e | |||
81d65cf14b | |||
8f1bdf55ed | |||
4939b3f87e | |||
81c27cf833 | |||
3c9f2c399c |
@ -22,8 +22,6 @@ jobs:
|
||||
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:
|
||||
|
@ -17,27 +17,7 @@ jobs:
|
||||
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:
|
||||
publish-on-tag:
|
||||
runs-on: act-runner
|
||||
if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
|
||||
needs: [build-amd64, build-arm64, build-arm]
|
||||
@ -87,7 +67,6 @@ jobs:
|
||||
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
|
||||
curl --header "Authorization: token ${{ secrets.GT_API_PAT }}" -v --upload-file $file $URL/$(basename $file)
|
||||
done
|
4
Makefile
4
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.1-b
|
||||
VERSION?=2.1.0-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
|
@ -65,7 +65,6 @@ 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/"
|
||||
|
@ -1,4 +1,7 @@
|
||||
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 \
|
||||
@ -16,14 +19,11 @@ RUN apt-get update && apt-get --yes --no-install-recommends install \
|
||||
libffi-dev \
|
||||
ca-certificates \
|
||||
unzip \
|
||||
libjpeg62-turbo-dev \
|
||||
libturbojpeg0-dev \
|
||||
libvncserver-dev \
|
||||
lua5.3
|
||||
ENV RUSTUP_HOME=/opt/rust/rustup
|
||||
ENV CARGO_HOME=/opt/rust/cargo
|
||||
|
||||
RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
|
||||
RUN . /opt/rust/cargo/env && rustup default stable
|
||||
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
|
||||
RUN chmod -R 777 /opt/rust/
|
||||
RUN apt-get update && apt-get --yes --no-install-recommends install \
|
||||
nodejs npm git wget libfuse2 fuse3
|
||||
@ -33,17 +33,13 @@ 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-arm64 \
|
||||
libsqlite3-dev:arm64 zlib1g-dev:arm64 libreadline-dev:arm64 libssl-dev:arm64 \
|
||||
libffi-dev:arm64 libjpeg62-turbo-dev:arm64 libvncclient1:arm64 \
|
||||
libsqlite3-dev:armhf zlib1g-dev:armhf libreadline-dev:armhf libssl-dev: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
|
||||
crossbuild-essential-armhf \
|
||||
libsqlite3-0:arm64 zlib1g:arm64 libreadline8:arm64 libssl3:arm64 \
|
||||
libffi-dev:arm64 libturbojpeg0:arm64 libvncclient1:arm64 \
|
||||
libsqlite3-0:armhf zlib1g:armhf libreadline8:armhf libssl3:armhf \
|
||||
libffi-dev:armhf libturbojpeg0:armhf libvncclient1:armhf
|
||||
|
||||
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
|
Reference in New Issue
Block a user