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

@@ -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
+          scons ZLIB_W32=$HOME/zlib SKIPUTILS="NSIS Menu" DOCTYPES=web dist-zip
-          echo https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID > build.log
+          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 }}

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',

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}{<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&amp;type=1" alt="SourceForge Logo" /></a>}

SConstruct

@@ -57,7 +57,8 @@ doc = [
 doctypes = [
 	'chm',
 	'html',
-	'htmlsingle'
+	'htmlsingle',
+	'web',
 ]
 
 ######################################################################