From 843d28b6d5cc59e825d338fdc142de9839349baa Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 2 Nov 2020 23:58:19 +0000 Subject: [PATCH] avoid (extremely buggy) sf shell git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7239 212acab6-be3b-0410-9dea-997c60f758d6 --- .github/workflows/build.yml | 50 ++++++++++++++++++++++++++++-------- Docs/src/SConscript | 12 +++++++++ Docs/src/config_web.but | 16 ++++++++++++ Docs/unreleased.png | Bin 0 -> 2820 bytes SConstruct | 3 ++- 5 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 Docs/src/config_web.but create mode 100644 Docs/unreleased.png diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e48b84b8..20c77a44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,18 +54,48 @@ jobs: - name: Config Errors if: ${{ failure() }} run: cat config.log - - name: Deploy + - name: Nightly Build run: | - echo $Env:DEPLOY_KEY > $HOME/deploy_key - Set-PSDebug -Trace 1 rm nsis-*.zip - scons ZLIB_W32=$HOME/zlib SKIPUTILS="NSIS Menu" DOCTYPES=html dist-zip - echo https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID > build.log + scons ZLIB_W32=$HOME/zlib SKIPUTILS="NSIS Menu" DOCTYPES=web dist-zip + echo https://github.com/$Env:GITHUB_REPOSITORY/actions/runs/$Env:GITHUB_RUN_ID > build.log ls -Name nsis-*.zip -OutVariable zip zip $zip build.log - scp -oStrictHostKeyChecking=no -oBatchMode=yes -i $HOME/deploy_key $zip kichik@web.sourceforge.net:/home/project-web/nsis/gh-build.zip - ssh -oStrictHostKeyChecking=no -oBatchMode=yes -i $HOME/deploy_key -T kichik,nsis@shell.sourceforge.net create - ssh -oStrictHostKeyChecking=no -oBatchMode=yes -i $HOME/deploy_key kichik,nsis@shell.sourceforge.net "cat /home/project-web/nsis/gh-build.zip | /home/project-web/nsis/bin/nightly-deploy.sh" - env: - DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} if: matrix.nightly == 'nightly' && github.ref == 'refs/heads/master' + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: build.zip + path: nsis-*.zip + if: matrix.nightly == 'nightly' && github.ref == 'refs/heads/master' + + nightly: + runs-on: ubuntu-20.04 + needs: [build] + steps: + - name: Download a single artifact + uses: actions/download-artifact@v2 + with: + name: build.zip + - name: Upload to SourceForge + run: | + echo $DEPLOY_KEY > $HOME/deploy_key + set -ex + chmod 600 $HOME/deploy_key + mkdir nightly + unzip nsis-*.zip -d nightly + LocalNightly=nightly/nsis-* + RemoteNightly=kichik,nsis@web.sourceforge.net:/home/project-web/nsis/htdocs/nightly + scp -oStrictHostKeyChecking=no -oBatchMode=yes -i $HOME/deploy_key nsis-*.zip kichik,nsis@web.sourceforge.net:/home/project-web/nsis/htdocs/nightly/nsis.zip + scp -oStrictHostKeyChecking=no -oBatchMode=yes -i $HOME/deploy_key $LocalNightly/build.log kichik,nsis@web.sourceforge.net:/home/project-web/nsis/htdocs/nightly/build.log + cp $LocalNightly/Docs/Contents.html $LocalNightly/Docs/index.html + echo "Options +indexes" > $LocalNightly/Docs/.htaccess + echo "Options +indexes" > $LocalNightly/Examples/.htaccess + echo "Options +indexes" > $LocalNightly/Include/.htaccess + echo "Options +indexes" > $LocalNightly/Contrib/.htaccess + rsync -e "ssh -oStrictHostKeyChecking=no -oBatchMode=yes" -va --delete $LocalNightly/Docs/ $RemoteNightly/Docs/ + rsync -e "ssh -oStrictHostKeyChecking=no -oBatchMode=yes" -va --delete $LocalNightly/Examples/ $RemoteNightly/Examples/ + rsync -e "ssh -oStrictHostKeyChecking=no -oBatchMode=yes" -va --delete $LocalNightly/Include/ $RemoteNightly/Include/ + rsync -e "ssh -oStrictHostKeyChecking=no -oBatchMode=yes" -va --delete $LocalNightly/Contrib/ $RemoteNightly/Contrib/ + env: + DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} \ No newline at end of file diff --git a/Docs/src/SConscript b/Docs/src/SConscript index 6cbf996a..525de61c 100644 --- a/Docs/src/SConscript +++ b/Docs/src/SConscript @@ -80,6 +80,18 @@ DOCS_CONFIG = { 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, 'NSISEXTRADIST' : File(Split('#Docs/style.css')), }, + 'web' : + { + 'NSISDOCCONFIG' : 'config_web.but', + 'NSISDOCEXTRAFILES' : File(Split('#Docs/style.css #Docs/unreleased.png')), + 'NSISDOCEXTRAACTION' : '', + 'NSISDOCHTMLFIXES' : + { + }, + 'NSISDOCTARGET' : htmls, + 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, + 'NSISEXTRADIST' : File(Split('#Docs/style.css #Docs/unreleased.png')), + }, 'htmlsingle' : { 'NSISDOCCONFIG' : 'config_htmlsingle.but', diff --git a/Docs/src/config_web.but b/Docs/src/config_web.but new file mode 100644 index 00000000..c9d7555f --- /dev/null +++ b/Docs/src/config_web.but @@ -0,0 +1,16 @@ +\title NSIS Users Manual + +\preamble NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge. + + +\cfg{xhtml-leaf-level}{1} + +\cfg{xhtml-leaf-smallest-contents}{3} + +\cfg{xhtml-leaf-contains-contents}{true} + +\cfg{xhtml-contents-depth-0}{3} + +\cfg{xhtml-head-end}{} + +\cfg{xhtml-body-end}{SourceForge Logo} diff --git a/Docs/unreleased.png b/Docs/unreleased.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d4a719396d4fdd5aa87414526692d2166bbb6e GIT binary patch literal 2820 zcmd5;30IRx7k=4P#7F{Vkyrvzf&xMa$fA`sSlJXpuuwE4L8Kze4gw8^BJc(UH31BQ zMNxJ{Qbffz0wzF}K%~V2vMCVu#ju1WEPeTYM9(+p%$YlPnfsiX=gthn^M?g#+LdhL>fG`PEprqEy%<>V9P7!gQ`x)gdGNe)rJLMY*07@#` zUFNU;#C1q1A7t-t4*;CoO6wE_XzuCZMs(WR+7gLGo12>(8yky@i}UmI3kwVD>+52% zSR#=uEiJ9Ct}ZVxOQq7awY8O%m9JmFj*X3tkB`sJ&Q48DjgF2^PEO9v%}q~FPfSeA z%*;&YMU6uMHl6YI#A~GK1{p;t)myBz#G-}b2ZQAQzU6Zh8n61LB>|uA0-*oh&cT5# z2mj$GG{zCV^9_BhBcJ&rcDz|_X_a*80Qyr$^P{csbKswH1V~sqfqrjz5k=UXC{RLN zd8NS0lJ?PJuj!)Gyaf*XQZMa$rYyx10kv#%iP?_=-pA+g4p^+`!mtkg367Lc0uNDO z#g9f_QI&`0Qr@*%qj_k9!^+4PWXUN~`)CTNaz7Y!Y|?U5^C@@LUvR*0B;~OV(iuPU zc)$8HY3Rw8eaf+(e%Rc|s}31LUp+*$n* zH@zp!ESu1QdwfroA9uJ{+il&-s* zYP;%QPbDRcS8V8`{1CCKxVj*1v*8=JCYi#jV@GSdoHWteq%~t%w1F(q^JuQjXZ1Jj zN{HzCt@L=r7J|E?;3J7kNvOI3p+I?^LUp(v188RUL#?mirah>~G8hAAKu}eFSRIAx zNi^BAJio0T`hGEj$DvfHf2T9Sv9bubNL^Kg^4`=yeQ($IZN-9i^;d~d51_2G8sMJG z2<}0*vzM>14KdlcsNwW}DZAcyLDe*#!4{PD$dY5uY7fpPD2k?@!%gES))dQ!SkHcH zciv}kma|-N;X1rSx}kAZ-NlXc;BWYehlTS5wi~{``f*!)hz;nRKEo}UGm6ut63Spe z{&LwZ6!OBwqU&5o43(GCHFATS_X9_YUe)n^Iby_)D7KZWucXE9Vu$g%SCmZRRp&0Bp*7J{K;ow(aiXa>P}S zUa+Q9z=iqf(2$=y^?PBG{s0qvAJX+|%$pVXo|$6_xx~blT3V z7kP2+gBzQBPIopVgU-n95BKx*c9|72HPEveB1%f>efgas?Gv1V;Kb7;(8?q@@vuuYj!x6nW=%jC(Ra<f{~yK@u5%7j_tU zW}s!9cPUu~@;?J>EJ4##iSHA89^(0xe|@<_eE*9t!M6&T1p$j|R3Z3yenin}y^wXJ zNXD{c%@K-YX&nD#ULj4}p@+tppo@d)bp?=rch3G1k%-$Bu1occSU*C$;^AUidi|W9 zvZYXd)Py=eKib-w@IuaR!Eq4vO0;Zeb_qY$iKI|*Dje| zn+F)*xY=dE=zjQwe*eC+6OW3SSnml#TO8^Sv-Ea8476EuU!B2FlL-w5<;>;~yZ(yv z>+l2AWabxmw)x)hCQ`-PO>zMUb4l$n=To|?b0Y;yCJ1B}8dGa7QM>GsJ!N9Rurf7M zckKXFH)_baBspkL7jC8bc5W_W++T{Hv@^ljcZAEl3v0{s*W`Ckt+vDGn6|sKHno4; z<4PUuK1xkuZtS}=OIJE2R>`i_Zf|HcP(2pf+@8nZ>PY zbA$v!$h8jw@)nYB(@JcXW0n5?@=jGU4K4A_VXMKTKh_0uXMT8RgOC~p7}Hg~S*g)Z zN@KPyV0Tb%nxd-*tc;3#YB)j@{>Bobeo)~EBgTWClMMpnrG0uP`ie=L^=3Q(bFBO1rfHy|MB?!hgk0I+rm{_xTobeCN@{S1mTSr z8igt@Z(1ln-&aSUZuKDu>=>qQR($=r04HS2%A)Hn@LqtmGA;Q`(XNNO*_yx+QM3MqonTp( z=3Cbk!mC#CX6ZXwqovnjx4?v)FPWI)h@D2@1IQdM z#5I@FbJJxo>=|GlRw3`iulCwnF|`pNp|TT_Qg|p=Skx7#J0vc$44G^Z z0|KI!wnQ*4+QSJ8IgzOrR{Vmj5)Hj|`j_9~jrQjOeFCB(c`{$?A9&hkR}j8axuX|( zRIa?t1TPl`)&~3J48~i;E~Av~px6F*jdWyluBuA{R586M1dM z{wL8x?h&?c<}xypc?QKlxMK00H1k6+#jrx={BkT6AL8*Ide#