diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 49b767b..11c310f 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -10,27 +10,117 @@ jobs: cloneDepth: 1 condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - !CommandStep - name: Build and Publish Deb Package + name: Build Jammy amd64 runInContainer: true image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest interpreter: !DefaultInterpreter commands: | - apt update -y - apt install -y pkg-config git cd Packaging/Linux - bash build-ubuntu-jammy.sh - bash push-ubuntu-jammy.sh + bash build-ubuntu-jammy.sh amd64 envVars: - name: GITEA_AUTH value: '@secret:GITEA_AUTH@' useTTY: true condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL - !CommandStep - name: Build and Publish Deb Package (Plucky) + name: Build Jammy arm64 + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-jammy.sh arm64 + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Jammy riscv64 + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-jammy.sh riscv64 + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Jammy armhf + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-jammy.sh armhf + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Plucky amd64 runInContainer: true image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest interpreter: !DefaultInterpreter - commands: "apt update -y\napt install -y pkg-config git \ncd Packaging/Linux\nbash build-ubuntu-plucky.sh\nbash push-ubuntu-plucky.sh\n" + commands: | + cd Packaging/Linux + bash build-ubuntu-plucky.sh amd64 + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Plucky arm64 + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-plucky.sh arm64 + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Plucky riscv64 + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-plucky.sh riscv64 + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Plucky armhf + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-plucky.sh armhf + envVars: + - name: GITEA_AUTH + value: '@secret:GITEA_AUTH@' + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: Build Plucky i386 + runInContainer: true + image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest + interpreter: !DefaultInterpreter + commands: | + cd Packaging/Linux + bash build-ubuntu-plucky.sh i386 envVars: - name: GITEA_AUTH value: '@secret:GITEA_AUTH@' diff --git a/Packaging/Linux/build-ubuntu-jammy.sh b/Packaging/Linux/build-ubuntu-jammy.sh index 614bd40..14b7be9 100644 --- a/Packaging/Linux/build-ubuntu-jammy.sh +++ b/Packaging/Linux/build-ubuntu-jammy.sh @@ -1,59 +1,36 @@ #!/bin/bash +if [[ "$1" == "amd64" ]]; then source ./version.sh mkdir -p build/jammy cd build/jammy mkdir build-amd64 -apt install -y tessesframework libgtk-4-dev libwebkitgtk-6.0-dev +apt install -y git tessesframework libgtk-4-dev libwebkitgtk-6.0-dev cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF cd build-amd64 make -j`nproc` make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_amd64 mkdir -p ../tessesframework-webview_$DEB_VERSION\_amd64/DEBIAN -apt remove -y tessesframework libgtk-4-dev libwebkitgtk-6.0-dev -apt autoremove -y bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_amd64/DEBIAN/control amd64 cd ../ dpkg-deb --build tessesframework-webview_$DEB_VERSION\_amd64 - -# ARM64 -mkdir build-arm64 -apt install -y tessesframework:arm64 libgtk-4-dev:arm64 libwebkitgtk-6.0-dev:arm64 -cmake -S ../../../../ -B build-arm64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/arm64.cmake -cd build-arm64 +else +source ./version.sh +mkdir -p build/jammy +cd build/jammy +mkdir build-$1 +apt install -y git tessesframework:$1 libgtk-4-dev:$1 libwebkitgtk-6.0-dev:$1 +cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1.cmake +cd build-$1 make -j`nproc` -make install DESTDIR=../tessesframework-webview$DEB_VERSION\_arm64 -apt remove -y tessesframework:arm64 libgtk-4-dev:arm64 libwebkitgtk-6.0-dev:arm64 -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_arm64/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_arm64/DEBIAN/control arm64 +make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_$1 +mkdir -p ../tessesframework-webview_$DEB_VERSION\_$1/DEBIAN +bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_$1/DEBIAN/control $1 cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_arm64 - -# RISCV64 -mkdir build-riscv64 -apt install -y tessesframework:riscv64 libgtk-4-dev:riscv64 libwebkitgtk-6.0-dev:riscv64 -cmake -S ../../../../ -B build-riscv64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/riscv64.cmake -cd build-riscv64 -make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_riscv64 -apt remove -y tessesframework:riscv64 libgtk-4-dev:riscv64 libwebkitgtk-6.0-dev:riscv64 -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_riscv64/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_riscv64/DEBIAN/control riscv64 -cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_riscv64 - -# ARMHF -mkdir build-armhf -apt install -y tessesframework:armhf libgtk-4-dev:armhf libwebkitgtk-6.0-dev:armhf -cmake -S ../../../../ -B build-armhf -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/armhf.cmake -cd build-armhf -make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_armhf -apt remove -y tessesframework:armhf libgtk-4-dev:armhf libwebkitgtk-6.0-dev:armhf -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_armhf/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_armhf/DEBIAN/control armhf -cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_armhf \ No newline at end of file +dpkg-deb --build tessesframework-webview_$DEB_VERSION\_$1 +fi +curl --user tesses50:$GITEA_AUTH -X DELETE \ + https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/tessesframework-webview/$DEB_VERSION/$1 +curl --user tesses50:$GITEA_AUTH \ + --upload-file build/jammy/tessesframework-webview_$DEB_VERSION\_$1.deb \ + https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload \ No newline at end of file diff --git a/Packaging/Linux/build-ubuntu-plucky.sh b/Packaging/Linux/build-ubuntu-plucky.sh index 0f1915b..df82625 100644 --- a/Packaging/Linux/build-ubuntu-plucky.sh +++ b/Packaging/Linux/build-ubuntu-plucky.sh @@ -2,71 +2,31 @@ source ./version.sh mkdir -p build/plucky cd build/plucky +if [[ "$1" == "amd64" ]]; then mkdir build-amd64 apt install -y tessesframework libgtk-4-dev libwebkitgtk-6.0-dev cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF cd build-amd64 make -j`nproc` make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_amd64 -apt remove -y tessesframework libgtk-4-dev libwebkitgtk-6.0-dev -apt autoremove -y mkdir -p ../tessesframework-webview_$DEB_VERSION\_amd64/DEBIAN bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_amd64/DEBIAN/control amd64 cd ../ dpkg-deb --build tessesframework-webview_$DEB_VERSION\_amd64 - -# ARM64 -mkdir build-arm64 -apt install -y tessesframework:arm64 libgtk-4-dev:arm64 libwebkitgtk-6.0-dev:arm64 -cmake -S ../../../../ -B build-arm64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/arm64.cmake -cd build-arm64 +else +mkdir build-$1 +apt install -y tessesframework:$1 libgtk-4-dev:$1 libwebkitgtk-6.0-dev:$1 +cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1.cmake +cd build-$1 make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_arm64 -apt remove -y tessesframework:arm64 libgtk-4-dev:arm64 libwebkitgtk-6.0-dev:arm64 -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_arm64/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_arm64/DEBIAN/control arm64 +make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_$1 +mkdir -p ../tessesframework-webview_$DEB_VERSION\_$1/DEBIAN +bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_$1/DEBIAN/control $1 cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_arm64 - -# RISCV64 -mkdir build-riscv64 -apt install -y tessesframework:riscv64 libgtk-4-dev:riscv64 libwebkitgtk-6.0-dev:riscv64 -cmake -S ../../../../ -B build-riscv64 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/riscv64.cmake -cd build-riscv64 -make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_riscv64 -apt remove -y tessesframework:riscv64 libgtk-4-dev:riscv64 libwebkitgtk-6.0-dev:riscv64 -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_riscv64/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_riscv64/DEBIAN/control riscv64 -cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_riscv64 - -# ARMHF -mkdir build-armhf -apt install -y tessesframework:armhf libgtk-4-dev:armhf libwebkitgtk-6.0-dev:armhf -cmake -S ../../../../ -B build-armhf -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/armhf.cmake -cd build-armhf -make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_armhf -apt remove -y tessesframework:armhf libgtk-4-dev:armhf libwebkitgtk-6.0-dev:armhf -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_armhf/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_armhf/DEBIAN/control armhf -cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_armhf - -# I386 -mkdir build-i386 -apt install -y tessesframework:i386 libgtk-4-dev:i386 libwebkitgtk-6.0-dev:i386 -cmake -S ../../../../ -B build-i386 -DCMAKE_INSTALL_PREFIX=/usr -DTFWEBAPP_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/i386.cmake -cd build-i386 -make -j`nproc` -make install DESTDIR=../tessesframework-webview_$DEB_VERSION\_i386 -apt remove -y tessesframework:i386 libgtk-4-dev:i386 libwebkitgtk-6.0-dev:i386 -apt autoremove -y -mkdir -p ../tessesframework-webview_$DEB_VERSION\_i386/DEBIAN -bash ../../../make-control.sh ../tessesframework-webview_$DEB_VERSION\_i386/DEBIAN/control i386 -cd ../ -dpkg-deb --build tessesframework-webview_$DEB_VERSION\_i386 \ No newline at end of file +dpkg-deb --build tessesframework-webview_$DEB_VERSION\_$1 +fi +curl --user tesses50:$GITEA_AUTH -X DELETE \ + https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/$1 +curl --user tesses50:$GITEA_AUTH \ + --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_$1.deb \ + https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload \ No newline at end of file diff --git a/Packaging/Linux/make-control.sh b/Packaging/Linux/make-control.sh index 49e0d95..b2f8f93 100644 --- a/Packaging/Linux/make-control.sh +++ b/Packaging/Linux/make-control.sh @@ -3,6 +3,6 @@ echo "Version: $DEB_VERSION" >> "$1" echo "Architecture: $2" >> "$1" echo "Essential: no" >> "$1" echo "Priority: optional" >> "$1" -echo "Depends: tessesframework libgtk-4-1 libwebkitgtk-6.0-4" >> "$1" +echo "Depends: tessesframework, libgtk-4-1, libwebkitgtk-6.0-4" >> "$1" echo "Maintainer: Mike Nolan" >> "$1" echo "Description: WebView For TessesFramework" >> "$1" \ No newline at end of file diff --git a/Packaging/Linux/push-ubuntu-jammy.sh b/Packaging/Linux/push-ubuntu-jammy.sh deleted file mode 100644 index 3376d32..0000000 --- a/Packaging/Linux/push-ubuntu-jammy.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -source ./version.sh -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/tessesframework-webview/$DEB_VERSION/amd64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/tessesframework-webview/$DEB_VERSION/arm64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/tessesframework-webview/$DEB_VERSION/riscv64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/tessesframework-webview/$DEB_VERSION/armhf -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/jammy/tessesframework-webview_$DEB_VERSION\_amd64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/jammy/tessesframework-webview_$DEB_VERSION\_arm64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/jammy/tessesframework-webview_$DEB_VERSION\_riscv64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/jammy/tessesframework-webview_$DEB_VERSION\_armhf.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/jammy/main/upload \ No newline at end of file diff --git a/Packaging/Linux/push-ubuntu-plucky.sh b/Packaging/Linux/push-ubuntu-plucky.sh deleted file mode 100644 index 61a61fa..0000000 --- a/Packaging/Linux/push-ubuntu-plucky.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -source ./version.sh -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/amd64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/arm64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/i386 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/riscv64 -curl --user tesses50:$GITEA_AUTH -X DELETE \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/tessesframework-webview/$DEB_VERSION/armhf -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_amd64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_arm64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_i386.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_riscv64.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload -curl --user tesses50:$GITEA_AUTH \ - --upload-file build/plucky/tessesframework-webview_$DEB_VERSION\_armhf.deb \ - https://git.tesseslanguage.com/api/packages/tesses50/debian/pool/plucky/main/upload \ No newline at end of file