Commit back changes for relese 20241201 and hopefully fixed webpage a…

…ction
bjasspa · Dec 24, 2024 · 4dcaea4 · 4dcaea4
1 parent a947a9a
commit 4dcaea4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/build-webpages.yml b/.github/workflows/build-webpages.yml
@@ -3,12 +3,6 @@ name: Build web-pages (Ubuntu-latest)
 on:
   workflow_dispatch:
     branches: [ main ]
-    inputs:
-      refToBuild:
-        description: 'Tag or commit SHA1 to build - must be on main'
-        default: ''
-        required: false
-        type: string
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -24,8 +18,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.refToBuild }}
 
       - name: Compile nroff tools
         run: |

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ _Right:_ GUI version - theme "Ayu Dark", displaying the hypertext enabled R docu
 You can compile the code yourself, or you pick one or two of the pre-compiled
 single file executables from the Release page or you install the usual mec/mew
 executables  using curl or the homebrew  package manager. For Windows you have
-as well a installer which is available [here](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_installer_windows.msi):
+as well a installer which is available [here](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_installer_windows.msi):
 
 
 Installation  using  curl for Linux and MacOS by copying and pasting the  following
@@ -107,12 +107,12 @@ the executables into a folder belonging to your PATH variable.
 
 | Platform      | Console/Terminal | GUI (X11 on Linux/Mac) |
 |:-------------:|:----------------:|:----------------------:|
-| Linux         | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_linux_mecs.zip)       | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_linux_mews.zip) |
-| MacOS apple   | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_macos_apple_mecs.zip) | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_macos_apple_mews.zip) |
-| MacOS intel   | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_macos_intel_mecs.zip) | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_macos_intel_mews.zip) |
-| Windows       | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_windows_mecs.zip)     | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101_abin_windows_mews.zip) |
+| Linux         | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_linux_mecs.zip)       | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_linux_mews.zip) |
+| MacOS apple   | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_macos_apple_mecs.zip) | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_macos_apple_mews.zip) |
+| MacOS intel   | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_macos_intel_mecs.zip) | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_macos_intel_mews.zip) |
+| Windows       | [mesc](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_windows_mecs.zip)     | [mesw](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201_abin_windows_mews.zip) |
 
-To test the integrity of the downloads you can use the [sha256 hash keys](https://github.com/bjasspa/jasspa/releases/download/me_20241101/Jasspa_MicroEmacs_20241101-sha256.txt)
+To test the integrity of the downloads you can use the [sha256 hash keys](https://github.com/bjasspa/jasspa/releases/download/me_20241201/Jasspa_MicroEmacs_20241201-sha256.txt)
 
 Then test the executable in your terminal:
 

diff --git a/microemacs/contribs/github.emf b/microemacs/contribs/github.emf
@@ -77,7 +77,7 @@ set-variable $time 0
 !emacro
 
 ; Build an action with given commit
-;  @# - if 0 don't download artifacts
+;  @# - 0x01 Use refToBuild to pass commit SHA, 0x02 don't download artifacts
 ;  @1 - Commit SHA1
 ;  @2 - Name of action to build
 ;  @3 - Full path to the artifact directory
@@ -90,7 +90,9 @@ define-macro github-build-action
   set-variable #l8 @3
   set-variable #l3 @4
   set-variable #l1 &cat "actions/workflows/" #l0
-  github-api-call &cat #l1 "/dispatches" "" &spr "{\"ref\":\"%s\",\"inputs\":{\"refToBuild\":\"%s\"%s}}" .git.hub-brn #l9 #l3
+  !iif &band 1 @#  set-variable #l3 &spr "\"refToBuild\":\"%s\"%s%s" #l9 &con &len #l3 "," "" #l3
+  !iif &len #l3  set-variable #l3 &spr ",\"inputs\":{%s}" #l3
+  github-api-call &cat #l1 "/dispatches" "" &spr "{\"ref\":\"%s\"%s}" .git.hub-brn #l3
   30000 ml-write &spr "[Action %s dispatched... ]" #l0
   ml-write &spr "[Action %s dispatched... Getting ID]" #l0
   github-api-json &spr "%s/runs?created=%%3e%%3d%s&head_sha=%s" #l1 &rep .git.hub-date "-" "%2d" #l9
@@ -176,7 +178,7 @@ define-macro github-build
   set-variable #l2 0
   !while &not &seq "" &set #l3 &lget .git.hub-bal &inc #l2 1
     github-build-action #l0 #l3 #l1 #l4
-    !iif &seq #l4 ""  set-variable #l4 &spr ",\"refToHelpAsset\":\"%s\"" #l9
+    !iif &seq #l4 ""  set-variable #l4 &spr "\"refToHelpAsset\":\"%s\"" #l9
   !done
   ml-write &spr "[Github Build: Complete, output to %s]" #l1
 !emacro
@@ -435,7 +437,7 @@ define-macro github-finalise-release
   beginning-of-buffer
   set-variable #l0 @wl
   !force 0 delete-buffer $buffer-bname
-  0 github-build-action #l0 "build-webpages.yml" #l1 ""
+  2 github-build-action #l0 "build-webpages.yml" #l1 ""
   goto-position "\x80"
   ml-write "[Release Finalised - commit changes to jasspa & homebrew-jasspa repositories]" 
 !emacro
diff --git a/microemacs/contribs/pytools.emf b/microemacs/contribs/pytools.emf
@@ -3,7 +3,7 @@
 ;  Created By    : Detlef Groth, University of Potsdam
 ;  Author        : Detlef Groth, University of Potsdam
 ;  Created       : Wed Sep 25 15:42:35 2024
-;  Last Modified : <241221.1254>
+;  Last Modified : <241224.1244>
 ;
 ;  Description   : Documentation viewer within MicroEmacs for
 ;                  Python  supporting section folding item-list navigation
@@ -135,6 +135,7 @@ define-macro py-format
       save-buffer 
     !endif
   !endif 
+  set-variable $debug 2
   !force set-variable #l1 .format
   !if &seq #l1 "ERROR"
     !if &and &seq &which "yapf" "" &seq &which "black" ""

diff --git a/microemacs/src/evers.mak b/microemacs/src/evers.mak
@@ -32,4 +32,4 @@
 meVER_CN = 20
 meVER_YR = 24
 meVER_MN = 12
-meVER_DY = 1
+meVER_DY = 2
diff --git a/microemacs/test/python/ibrowse.py b/microemacs/test/python/ibrowse.py
@@ -125,7 +125,7 @@ def makemainmenu(win):
 	additem(mp, 'Help (tutorial)',		'H', itutor)
 	additem(mp, 'Command summary',		'?', isummary)
 	additem(mp, 'Close this window',	'W', iclose)
-	additem(mp, '', '', None)
+  	 additem(mp, '', '', None)
 	additem(mp, 'Copy to clipboard',	'C', icopy)
 	additem(mp, '', '', None)
 	additem(mp, 'Search regexp...',		'S', isearch)