summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Pinto Silva <pedro.silva@collabora.com>2021-11-25 16:13:10 +0100
committerPedro Pinto Silva <pedro.silva@collabora.com>2021-11-26 17:38:45 +0100
commitad0b2d38430ec4b320a97e29fd34195467563a46 (patch)
tree871c9effe475caf6520fe02802ff89804e2acb19
parentjsdialog: don't use mobile version of combobox on desktop (diff)
downloadonline-ad0b2d38430ec4b320a97e29fd34195467563a46.tar.gz
online-ad0b2d38430ec4b320a97e29fd34195467563a46.zip
GitPod: Fix yml and dockerfile, edit configure recipe
- Fix: the initial steps such as extracting the zip were not happening - Fix deprecated yml task types - Fix: SSL warning by disabling SSL when doing make - Add missing task names - Add missing cypress tests so people can use it - Install Chromium dummy package side by side with FF since it's a cypress dependency because on Ubuntu it requires to be installed via snapd but gitpod doesn't allow that has there is no plans to do so) - Users can now run cypress test in GitPod using Firefox, example: - CYPRESS_BROWSER="firefox" make check - CYPRESS_BROWSER="firefox" make check-[device] spec=[app/test] - Make use of "wait commands" - So we can wait for the configure before doing the make and so we can do each one in a different terminal - This also makes it easier for new users to go back and check configure and make history output - So we can listen and wait for the port to be open and then print next step instructions - Better of tasks and setup terminals - "Get Core and autgen/Configure Online" in one - "Make" and instructions on how to open the browser in another (split) Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com> Change-Id: I915ea0e22c76191651cc0fd50e55edcc2fc58013
-rw-r--r--.gitpod.dockerfile2
-rw-r--r--.gitpod.yml31
2 files changed, 29 insertions, 4 deletions
diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index c9a90877ea..a960a1ed15 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -7,7 +7,7 @@ RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ focal main restri
&& sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security multiverse >> /etc/apt/sources.list" \
&& sudo apt-get update \
&& sudo apt-get install -y \
- build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev python3-lxml libpam-dev firefox \
+ build-essential git libpoco-dev libcap-dev python3-polib npm libpng-dev python3-lxml libpam-dev firefox chromium-browser\
&& sudo apt-get build-dep -y libreoffice \
&& pip install lxml \
&& pip install polib \
diff --git a/.gitpod.yml b/.gitpod.yml
index b47dce17b2..c1fb2fca71 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -5,7 +5,7 @@ ports:
- port: 9980
onOpen: ignore
- port: 6080
- protocol: "http"
+ onOpen: "open-browser"
- port: 5900
onOpen: ignore
@@ -33,6 +33,31 @@ github:
# 1. Ping infra team to re-configure with the new URL
# 2. Update URL here under tasks
tasks:
- - init: cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
- prebuild: tar xvf core-co-2021-assets.tar.gz && rm core-co-2021-assets.tar.gz && cd online && ./autogen.sh && ./configure --enable-silent-rules --with-lokit-path=/workspace/include --with-lo-path=/workspace/instdir --enable-debug --disable-setcap && cp .gitpod-files/coolwsd-gitpod.xml coolwsd.xml && mkdir .vscode && cp .gitpod-files/settings.json .vscode/settings.json && make -j `nproc`
+ - name: Get Core & Configure
+ before: |
+ cd ..
+ wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
+ tar xvf core-co-2021-assets.tar.gz
+ rm core-co-2021-assets.tar.gz
+ cd online
+ init: |
+ ./autogen.sh
+ ./configure --enable-silent-rules --with-lokit-path=/workspace/include --with-lo-path=/workspace/instdir --enable-debug -enable-cypress --disable-setcap
+ gp sync-done configuring
+ cp .gitpod-files/coolwsd-gitpod.xml coolwsd.xml
+ mkdir .vscode
+ cp .gitpod-files/settings.json .vscode/settings.json
+ - name: Building
+ init: gp sync-await configuring
+ command: make -j$(nproc) run
+ - name: Test
+ init: gp await-port 9980
+ command: |
+ echo "To open and test in the web browser:"
+ echo "1. Make sure your web browser is not blocking any tabs from opening;"
+ echo "2. Check that you have the VCN tab opened (if not, open it up from the left side Remote explorer > 6080)"
+ echo "3. In the terminal where make is running: scroll and copy the the URL ending with: hello-world.odt"
+ echo "4. In a new terminal execute the following:"
+ echo " firefox [paste copied URL here]"
+ openMode: split-right