jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-21 21:10:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update build

Browse Source
This commit is contained in:
jacob.eva 2024-09-12 14:03:25 +01:00
parent 5c73f8cea8
commit 4fa6b4260a
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile
View File

@ -15,9 +15,15 @@ COPY ./ Sideband/
COPY docker/init.gradle .gradle/ COPY docker/init.gradle .gradle/
# Clone required repos # Clone required repos
RUN git clone https://github.com/markqvist/Reticulum \ RUN git clone https://github.com/jacobeva/Reticulum \
&& git clone https://github.com/markqvist/LXMF && git clone https://github.com/markqvist/LXMF
# Switch branches
WORKDIR "Reticulum"
RUN git switch ble-dev
WORKDIR ".."
# Fetch files required for sideband local repository # Fetch files required for sideband local repository
RUN mkdir dist_archive RUN mkdir dist_archive
@ -41,13 +47,15 @@ RUN export VERSION=$(wget -qO - https://api.github.com/repos/markqvist/RNode_Fir
| tr -d \", | wget -qi - -O RNode_Firmware_${VERSION}_Source.zip | tr -d \", | wget -qi - -O RNode_Firmware_${VERSION}_Source.zip
# Get source for reticulum.network and unsigned.io sites # Get source for reticulum.network and unsigned.io sites
RUN git clone https://github.com/markqvist/reticulum_website reticulum.network \ RUN wget -q https://github.com/markqvist/reticulum_website/archive/refs/heads/main.zip \
&& cp reticulum.network/docs/manual/Reticulum\ Manual.pdf . \ && unzip main.zip "reticulum_website-main/docs/*" \
&& cp reticulum.network/docs/manual/Reticulum\ Manual.epub . && cp -r reticulum_website-main/docs reticulum.network && rm -r reticulum_website-main \
&& cp reticulum.network/manual/Reticulum\ Manual.pdf . \
&& cp reticulum.network/manual/Reticulum\ Manual.epub .
# A mirror can also be accessed at https://liberatedsystems.co.uk/unsigned_io_archive.zip if unsigned.io is down! # A mirror can also be accessed at https://liberatedsystems.co.uk/unsigned_io_archive.zip if unsigned.io is down!
RUN wget -q https://unsigned.io/unsigned_io_archive.zip \ RUN wget -q https://liberatedsystems.co.uk/unsigned_io_archive.zip \
&& unzip -q unsigned_io_archive.zip -d unsigned.io && rm unsigned_io_archive.zip && unzip -q unsigned_io_archive.zip && rm unsigned_io_archive.zip
WORKDIR "../Sideband/sbapp" WORKDIR "../Sideband/sbapp"

9
Makefile
View File

@ -17,7 +17,7 @@ console:
clean: clean:
@echo Cleaning... @echo Cleaning...
-rm -r ./build -rm -r ./build
-rm -r ./dist -rm -rf ./dist
cleanbuildozer: cleanbuildozer:
make -C sbapp cleanall make -C sbapp cleanall
@ -34,9 +34,12 @@ build_wheel:
release: build_wheel apk fetchapk release: build_wheel apk fetchapk
release_docker: release_docker:
-mkdir -p ./dist
@echo If you experience errors, please ensure you have docker-buildx installed on your system. @echo If you experience errors, please ensure you have docker-buildx installed on your system.
sudo docker build --target=artifact --output type=local,dest=./dist/ . @echo This target uses a custom buildkit image to allow for full viewing of the logs on build, but takes slightly longer as a result.
-mkdir -p ./dist
# Needed for allowing the viewing of the full log
-sudo docker buildx create --bootstrap --use --name buildkit --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1 &> /dev/null
sudo docker buildx build --target=artifact --output type=local,dest=./dist/ .
@echo Build successful. APK copied to ./dist directory. @echo Build successful. APK copied to ./dist directory.
$(MAKE) sign_release $(MAKE) sign_release