From a73f4595a94f460794e1ffd0ef95890387cb0ad5 Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Sun, 22 May 2022 09:53:04 +0200 Subject: [PATCH] feat/123: enable linux build (#127) * feat/123: enable linux build * feat/123: style: handle window width gracefully * feat/123: update README --- .github/linux-download.png | Bin 2224 -> 2382 bytes .github/workflows/build.yml | 43 ++++++++++++++++++ README.md | 3 +- client/src/features/info/InfoLogger.jsx | 5 +- .../src/features/info/InfoLogger.module.scss | 9 ++-- server/package.json | 7 ++- 6 files changed, 57 insertions(+), 10 deletions(-) diff --git a/.github/linux-download.png b/.github/linux-download.png index 5da52473b3fe6228fa614219ba8fb245c1653b9c..5afa74cbf01d1f46bff9574d2b94b513cf7cac24 100644 GIT binary patch delta 2321 zcmV+s3GVi=5zZ2jR)6D3L_t(|0qvZzZyd)J#^2tNM@p8=qr0Th5r|zzloBANC?HjU zfK;I>2uLA7fTRe?q;o^+4+umBa7`*kkdk7Vie#0-hVSUYfD1!MtFUAP;t_@c$rN;+ z-|oKKx5GW^Zh0c9<9)#BW_D(0XXbnF&CHt-14*Oo!n_MJaeurb1H27rxKNA3eHZFk zg=WXc$M=?&mYSQJo6Sd$9yJGeJFvI67jiZ?H`jDL?zynwlRICjR0gE>0pJiWQCNr# zBr?NQmr-^ZGQiu9dc7{!uU~IC&7LT_^s-a!DHmjb{y@20mgmo(k8W*ky(qZ!)!Eru z8KA##!2VAWJt~kbO4ZMIt=M<%O?Gf z2M->|y?giMP2tQCtU!ZV@U5(@gj!`ane_Jdb|~elX@6?obed69rPg= zQXHi*`n{`Hugc8K%%QxUot?~jXcNSN>FMbs>!(d?YinWqwGT(tO?m34U5r5|8s9t) z*mtqfJ`R?bmk&LoPB!kg44ZjStyWWcHtqzY>BwlM7Zw&;aVIQIXDPzEX}5iky4^sh z>apLm^?#^iLF=*KBTZTI2!4C~K9Xn0koMthvUS_>B~6)5#vN`8k`rjg#Kc4xoChqN zXL`9vL3$OcrK-&;?MS+o)o=4lo=sa|9Vn0F+xPsw0sB45>T}}c*?JWB@86gC`T3UB zK+D>Vi|J`=TO)wp?9e>7j@T`~6fuU}H(S_M$Q3No9l%YLW zu3QPtnx^dz!8d0|5lsCS)WhH_5H6+>I}ZA;{f-iq7xbIH*!sFbZh{#Yb&jwYBCQ(L z3s9HNU+st(8ygFMb?|l0CNR&Ej`xFIf$ypCSRg!Lad9#Hb*4DfFiT(-ncY}6pFrO2 zmVZ=>+ysXb{?d_rdoo-QFsQxS%h4%T(Ymm)=2(H*QtedpNjr3ac}6L`&CWmKU@u;UAuNIB-d>rWPsBL1cPR`V4tUZL<{zrPU156wSNPg zJm9u#g4twqpq#bICQnJu5`Y0t7I53OiN1OBW;pM(bDrb$z)WMZ2d4UTfr;*Fo5aLV zIO@cO)t}SuL)(l2P6u5P94@S05p|;{PWFB?W}+PKxTjI z4h4Sc=HGucWdG^$&Gi2Me#(KOmjlph_Ts)Ho})Kw4VWs_iJ~4d>uI7qp`Y>E)!62L z-Er6dr4_3GmT;x)ucX)ivz#h-@59NCuHrgxQQNJRpGSN7He0p$9&jq3Re!ua24rP# z`^bCRcFpV8>%#P{BNN?tg^5hGV)A|GQu{~R%MxnVms>LPx8%Kr-`AYEzU$`fRp})# z<@Oc?8rkXX56V#S?`RFMnYnR=kn#~9TgJNS_WLYlnB=`(C(P;JR!LkT`1V6>9`VZ z<5md#Uz>Mu5QQIpNPnI`dD6aox^)rB5Uv71P=P=QY#wog^G>b;g6sRAKCXzpLNSJS!0P*T&y@N6rIc z=THNJ8`a0($kf4Tbb1(w8g4V7;%Rn9jY9Fx1Q{-!$GH)^B!=4%hZ)|^CpPc&ngtV9o;(wHI zCAcYv$t}bK{K|zNUqwO7e18zV5WFz;O1d7cTP+5J55<-QVL(VUt?^fk`QFc@G&E3q9PH|{J#wx r%l+xz=|9vZ`cq0=1Ye2cA$|gf+b&1J=qW`2015yANkvXXu0mjfh?tl6 delta 2161 zcmV-%2#)v860i}FR)0lFL_t(|0qva6YZOTo$6sd0I0+%YP9X>;5W=3;821oQ#)BYx zSmQ;|ixC#w-HQ?N;K_IvF(Sg={P7PM5oGa_-5r2@2CdzIIK{U!9h7jWRr>EcK zrP4i_?wS0aFBDzXRbAa(-}hdGC?ISzZpaR|l?|2jE2nW>PwJpjqw-QC&GpFaRYUS4~s%rqhg? zI@JVg8PFDv2oT5BG)C{YZ{I%Y>+4%lr~SG8@J!x%)X%%uh4n#Oo?qXgP~V)Vf1V59 zX*G>cNr_+p*JAF1K%`rNMgz2(fxzqm2I0ny8~JvScmDkOe3?4h0M0Xb^v%F&pJ712 z^nMJY?SE6>SNpMbj0gQvN8)*+#)tQCNrY_3vwhp^bvlDweXl}DOfWZTZ*TXL7XkAJ zyqrYahgU6CZDwH5D#+5ddhah^zWDW8cAtrXqdfy^uXEoG*!$5|&nqdm9|Z#CEm87T zgZo8|i?*?SKrTY1=jltWfqe(}zEMa_FfU?X7=P1YHK`oXfuZlf?azZj*ZUtkcFb=> z8S_nBEh7jD*PIn1*j-szfdb^wa+39c$=mxVQAvRyy?F6rS$}bmm|zA*=RqWnvK@d@ zL0=FDqKMF!g$yKL=WG(5sXK=k3#+XbN|c)9fq?-(SpvhzjAPkc0=YIWsTPR|MxqxM z7JuZ#i4(qrF_7h2%kfgoHR_-!ffmfqs%1(D&!Gd%Im$`a`1E1525^7vi|2ElKLz)- z<+whI+nzbxwO(GP1s=b+8|_wSdH&3~N9bxaZ3R~!?~lIi&IF{XucL;-iZpH6ZAlnG1(PUy|KVV$I@UXehrgFfu)UpBUHi0BNo9L z*Dd7stLGPIkCVUwW$g>z2&U&Pu6pzqHWZ6ttRWaRc${ z1S-_4*S^SG2axt|AKM8<5&Zb^W7)H3kF>V7N?l!@KL@ksbt6|_zkc-{tgBbAN@r)M zJbd`D~c1E$=51%XBuyY8kP?I9WAgZy$o-)2Hl z1goiqSOsB921&m#AhGeFc=YIzbaZscsZ*z<+$e<*gc9LkxkrAx2V{yOm@P4+{oT8F z^5Me=dHwpePdcVrH3@<-jepm!U6c9wdH=W>G(%0f1<$GGI_Z|;RzcBTwEeA8R3Kfy zq(~AVM}VyJqhC?Pg?@aX!TK;K30q!q z>@rhyhP;~ZbdD6;UVouv>9H6Aajk$}!}9Fo$KossZ7k{b=;n6-0zWAWMcMIxrlogb zx6_0jrmE;381qG03Y9>#P1Mzfn4j5Ry!UkZ8VGVZmDPVk$6hUkWP# z-g0k+Ak@|_O&MDh!Di14!#goHJJr(L+U_*5f+vU2BlubUzHqBlyw43@m1vsxt$B z|NMKVt-figh4K`|NnWdD^?;{pyM(n(t!$SnvNNWN>VRmDyOsQOu8#4qO&9M&6ufO} zrDcF%R|r%PHh)kEf*&RDR}O!uns&9-HTI4C^oz9BH557L1;;!g!N4ygGFA9Gajq3J z|1V0BguBlYaZe>0;%kC@eR@eC^s;iTAS_rhs54033Wf?rnPC3H;ZLvl#M)v0U8lFd zqdW6k=a2G3bBni9*&XsyvV6d8ele^ZLY~%1$efxof@+e_rwUk-uzQC}(aLLVnWn1w zyU14u7DASUAQPdDaaJ8su$r$vfC|GZLZBaFuqoqh&hXa_kn2yvt{27P6rx*#RN7*+ ng7pFp1txhya{sQA)r$WC+jSR(9=)J+00000NkvXXu0mjfVKF%- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39972b49f..6667c3d86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,3 +93,46 @@ jobs: files: ./server/dist/ontime-win64.exe env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build_linux: + runs-on: ubuntu-latest + env: + CI: '' + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: '14.x' + + # React + - name: React - Install dependencies + run: yarn install + working-directory: ./client + + - name: React - Build project + run: yarn build + working-directory: ./client + + # Node server + - name: Server - Install dependencies + run: yarn install + working-directory: ./server/src + + # App + - name: Electron - Install dependencies + shell: bash + run: yarn install && yarn setdb + working-directory: ./server + - name: Electron - Build app + run: yarn dist-linux + working-directory: ./server + + # Release + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: ./server/dist/ontime-linux.AppImage + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index c13be4172..e8854dce5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
Download MacOS Download Windows - Download Linux + Download Linux
# Ontime @@ -126,7 +126,6 @@ friendly order unless there is user demand to bump any of them. - [ ] Improvement with event component design - [ ] New playback mode for [cumulative time keeping](https://github.com/cpvalente/ontime/issues/100) -- [ ] Linux version - [ ] Headless version (run server only anywhere, configure from a browser locally) - [ ] Companion module - [ ] Lower Third Manager diff --git a/client/src/features/info/InfoLogger.jsx b/client/src/features/info/InfoLogger.jsx index cd976f246..d531468b7 100644 --- a/client/src/features/info/InfoLogger.jsx +++ b/client/src/features/info/InfoLogger.jsx @@ -1,5 +1,4 @@ import React, { useCallback, useContext, useEffect, useState } from 'react'; -import { HStack } from '@chakra-ui/react'; import CollapseBar from '../../common/components/collapseBar/CollapseBar'; import { LoggingContext } from '../../app/context/LoggingContext'; import style from './InfoLogger.module.scss'; @@ -60,7 +59,7 @@ export default function InfoLogger() { setCollapsed((c) => !c)} /> {!collapsed && ( <> - +
setShowUser((s) => !s)} onAuxClick={() => disableOthers('USER')} @@ -118,7 +117,7 @@ export default function InfoLogger() {
Clear
- +
    {data.map((d) => (