[prev in list] [next in list] [prev in thread] [next in thread]
List: nsis-commits
Subject: [NSIS-commits] SF.net SVN: nsis:[7239] NSIS/trunk
From: kichik--- via NSIS-commits <nsis-commits () lists ! sourceforge ! net>
Date: 2020-11-02 23:58:19
Message-ID: 1604361499.515607.14476 () sfp-scm-2 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]
Revision: 7239
http://sourceforge.net/p/nsis/code/7239
Author: kichik
Date: 2020-11-02 23:58:19 +0000 (Mon, 02 Nov 2020)
Log Message:
-----------
avoid (extremely buggy) sf shell
Modified Paths:
--------------
NSIS/trunk/.github/workflows/build.yml
NSIS/trunk/Docs/src/SConscript
NSIS/trunk/SConstruct
Added Paths:
-----------
NSIS/trunk/Docs/src/config_web.but
NSIS/trunk/Docs/unreleased.png
Modified: NSIS/trunk/.github/workflows/build.yml
===================================================================
--- NSIS/trunk/.github/workflows/build.yml 2020-11-02 22:51:31 UTC (rev 7238)
+++ NSIS/trunk/.github/workflows/build.yml 2020-11-02 23:58:19 UTC (rev 7239)
@@ -54,18 +54,48 @@
- 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" + 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 }}
- if: matrix.nightly == 'nightly' && github.ref == 'refs/heads/master'
+ DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
\ No newline at end of file
Modified: NSIS/trunk/Docs/src/SConscript
===================================================================
--- NSIS/trunk/Docs/src/SConscript 2020-11-02 22:51:31 UTC (rev 7238)
+++ NSIS/trunk/Docs/src/SConscript 2020-11-02 23:58:19 UTC (rev 7239)
@@ -80,6 +80,18 @@
'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',
Added: NSIS/trunk/Docs/src/config_web.but
===================================================================
--- NSIS/trunk/Docs/src/config_web.but (rev 0)
+++ NSIS/trunk/Docs/src/config_web.but 2020-11-02 23:58:19 UTC (rev 7239)
@@ -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}{<link rel="stylesheet" href="style.css" type='text/css' \
/><style>body\{background-image:url(unreleased.png)\}</style>} +
+\cfg{xhtml-body-end}{<a href="https://sourceforge.net"><img border=0 \
src="https://sourceforge.net/sflogo.php?group_id=22049&type=1" alt="SourceForge \
Logo" /></a>}
Added: NSIS/trunk/Docs/unreleased.png
===================================================================
(Binary files differ)
Index: NSIS/trunk/Docs/unreleased.png
===================================================================
--- NSIS/trunk/Docs/unreleased.png 2020-11-02 22:51:31 UTC (rev 7238)
+++ NSIS/trunk/Docs/unreleased.png 2020-11-02 23:58:19 UTC (rev 7239)
Property changes on: NSIS/trunk/Docs/unreleased.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: NSIS/trunk/SConstruct
===================================================================
--- NSIS/trunk/SConstruct 2020-11-02 22:51:31 UTC (rev 7238)
+++ NSIS/trunk/SConstruct 2020-11-02 23:58:19 UTC (rev 7239)
@@ -57,7 +57,8 @@
doctypes = [
'chm',
'html',
- 'htmlsingle'
+ 'htmlsingle',
+ 'web',
]
######################################################################
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic