1
0
mirror of synced 2026-04-19 17:42:55 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Frank Halasz
62754015b0 Update Medley build workflow to add clos to release tars and to update various actions to latest versions (#1025)
* Add clos to release tars for Medley.  To ease adding clos to Medley Online.

* Fix buildLoadup.yml to account for the fact that scripts/loadup-all.sh now automatically includes scripts/copy-all.sh.  Was failing due to redundant copying of loadup files.

* Get rid of ::set-output:: in buildLoadup.yml and replace with echo >> .  This is due to that fact that ::set-output:: has been deprecated by Github and will soon cause an error if used in a workflow.

* Update actions/checkout and robinraju/release-downloader to latest versions because versions currently being used relied on Node 12, which has been deprecated.  Newer versions of these actions use Node 16, which is still supported.

* Fix typo in actions/checkout new version number

* Oops.  Node 16 is supported by actions/checkout@v3 not by ...@v2.5.0

* Update AButler/upload-release-assets fron @v2.0 to @v2.0.2 to take care of Node 12 versus Node16 issues caused by Node 12 actions being deprecated by github.

* Fix quoting bugs on conversions from ::set-output:: to

* Try switching to the ncipollo/release-action acgtion in place of using the api to create the release and then the AButler/upload-release-assets action to upload the assets.  This is to solve the failures when try to update a release using the force input parameter.

* Adding step to delete existing release with given tag, if any.  Needed when force parameter is true.

* Fixing typo?

* Typos again?

* Start changing how RELEASE_TAG environment variable is used throughout build_loadup

* Finish changing how RELEASE_TAG environment variable is used throughout build_loadup

* Update abatilo/release-info-action to v1.3.2 to take care of ::set-output:: deprecation

* Add commit to allow testing of release builds

* Fix to Issue#1022 Error during greet

* More fix to Issue#1022.  Turns out need to reset MEDLEYDIR for AFTERMAKESYS as well as at greet time.  Discovered during loadup-online.sh with no greet file.

* Removing AFTERMAKESYS event action from (MEDLEY-INIT-VARS).  Cleaning up a bit the GREET event action in (MEDLEY-INIT-VARS).  Remove issue with MEDLEY-INIT-VARS being called after the user greet file in the AFTERMAKESYS case.
2022-11-26 15:05:45 -08:00
Frank Halasz
9d09033cc4 Fix to Issue#1022 "Error during greet" (#1027)
* Fix to Issue#1022 Error during greet

* More fix to Issue#1022.  Turns out need to reset MEDLEYDIR for AFTERMAKESYS as well as at greet time.  Discovered during loadup-online.sh with no greet file.

* Removing AFTERMAKESYS event action from (MEDLEY-INIT-VARS).  Cleaning up a bit the GREET event action in (MEDLEY-INIT-VARS).  Remove issue with MEDLEY-INIT-VARS being called after the user greet file in the AFTERMAKESYS case.
2022-11-26 11:46:41 -08:00
6 changed files with 56 additions and 100 deletions

View File

@@ -1,4 +1,4 @@
#re*******************************************************************************
#*******************************************************************************
# buidLoadup.yml
#
# Interlisp workflow to build Medley release and push it to github. This workflow
@@ -59,8 +59,8 @@ jobs:
- id: force
run: >
if [ '${{ toJSON(inputs) }}' = 'null' ];
then echo ::set-output name=force::'${{ github.event.inputs.force }}'; echo "workflow_dispatch";
else echo ::set-output name=force::'${{ inputs.force }}'; echo "workflow_call";
then echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT; echo "workflow_dispatch";
else echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT; echo "workflow_call";
fi
@@ -79,7 +79,7 @@ jobs:
steps:
# Checkout the actions for this repo owner
- name: Checkout Actions
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ github.repository_owner }}/.github
path: ./Actions_${{ github.sha }}
@@ -110,7 +110,7 @@ jobs:
steps:
# Checkout the actions for this repo owner
- name: Checkout Actions
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ github.repository_owner }}/.github
path: ./Actions_${{ github.sha }}
@@ -118,7 +118,7 @@ jobs:
# Checkout latest commit
- name: Checkout Medley
uses: actions/checkout@v2
uses: actions/checkout@v3
# Setup release tag
- name: Setup Release Tag
@@ -129,20 +129,20 @@ jobs:
- name: Setup Environment Variables
id: setup_env
run: |
echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
# Get Maiko release information, retrieves the name of the latest
# release. Used to download the correct Maiko release
- name: Get Maiko Release Information
id: latest_version
uses: abatilo/release-info-action@v1.3.0
uses: abatilo/release-info-action@v1.3.2
with:
owner: ${{ github.repository_owner }}
repo: maiko
# Download Maiko Release Assets
- name: Download Release Assets
uses: robinraju/release-downloader@v1.2
uses: robinraju/release-downloader@v1.6
with:
repository: ${{ github.repository_owner }}/maiko
token: ${{ secrets.GITHUB_TOKEN }}
@@ -165,24 +165,20 @@ jobs:
- name: Build loadups release tar
run: |
cp -p tmp/full.sysout tmp/lisp.sysout tmp/whereis.hash loadups/
cp -p tmp/exports.all library/
cd ..
tar cfz medley/tmp/${release_tag}-loadups.tgz \
tar cfz medley/tmp/${RELEASE_TAG}-loadups.tgz \
medley/loadups/lisp.sysout \
medley/loadups/full.sysout \
medley/loadups/whereis.hash \
medley/library/exports.all
env:
release_tag: ${{ steps.tag.outputs.release_tag }}
- name: Build runtime release tar
run: |
cd ..
tar cfz medley/tmp/${release_tag}-runtime.tgz \
tar cfz medley/tmp/${RELEASE_TAG}-runtime.tgz \
--exclude "*~" --exclude "*#*" \
--exclude exports.all \
medley/clos \
medley/docs/dinfo \
medley/doctools \
medley/greetfiles \
@@ -197,40 +193,25 @@ jobs:
medley/lispusers \
medley/sources \
medley/internal
env:
release_tag: ${{ steps.tag.outputs.release_tag }}
- name: "Create release"
uses: "actions/github-script@v5"
- name: Delete existing release with same tag (if any)
uses: cb80/delrel@latest
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
script: |
try {
await github.rest.repos.createRelease({
draft: false,
generate_release_notes: true,
name: process.env.release_tag,
owner: context.repo.owner,
prerelease: false,
repo: context.repo.repo,
tag_name: process.env.release_tag,
});
} catch (error) {
core.setFailed(error.message);
}
env:
release_tag: ${{ steps.tag.outputs.release_tag }}
- name: "Upload release assets"
uses: AButler/upload-release-assets@v2.0
with:
files: 'tmp/${{ env.release_tag }}-loadups.tgz;tmp/${{ env.release_tag }}-runtime.tgz'
repo-token: ${{ secrets.GITHUB_TOKEN }}
release-tag: ${{ env.release_tag }}
env:
release_tag: ${{ steps.tag.outputs.release_tag }}
tag: ${{ env.RELEASE_TAG }}
continue-on-error: true
- name: Push the release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts:
tmp/${{ env.RELEASE_TAG }}-loadups.tgz,
tmp/${{ env.RELEASE_TAG }}-runtime.tgz
tag: ${{ env.RELEASE_TAG }}
draft: false
prerelease: false
generateReleaseNotes: true
token: ${{ secrets.GITHUB_TOKEN }}
######################################################################################
@@ -249,7 +230,7 @@ jobs:
steps:
# Checkout the actions for this repo owner
- name: Checkout Actions
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ github.repository_owner }}/.github
path: ./Actions_${{ github.sha }}
@@ -265,6 +246,6 @@ jobs:
- name: Output
id: output
run: |
echo ::set-output name=build_successful::'true'
echo "build_successful='true'" >> $GITHUB_OUTPUT
######################################################################################

View File

@@ -1,10 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 9-Mar-2022 11:50:44" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;2 4690
(FILECREATED "22-Nov-2022 20:59:24" {DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;6 2860
:CHANGES-TO (VARS MEDLEYDIR-INITCOMS)
:PREVIOUS-DATE "28-Feb-2022 21:13:20" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;1)
:PREVIOUS-DATE "22-Nov-2022 20:42:43"
{DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;5)
(PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
@@ -13,7 +14,7 @@
([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
"")
"/sources/MEDLEYDIR.LCOM"))
(MEDLEY-INIT-VARS)
(MEDLEY-INIT-VARS 'GREET)
(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
(FILES BACKGROUND-YIELD)
(VARS
@@ -38,7 +39,7 @@
"")
"/sources/MEDLEYDIR.LCOM"))
(MEDLEY-INIT-VARS)
(MEDLEY-INIT-VARS 'GREET)
(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
@@ -81,44 +82,7 @@
:PACKAGE "INTERLISP"])
)
(ADDTOVAR FONTDEFS
[LARGER (FONTCHANGEFLG . ALL)
(FILELINELENGTH . 102)
(FONTPROFILE (DEFAULTFONT 1 (GACHA 12)
(GACHA 10)
(TERMINAL 10)
(POSTSCRIPT (TERMINAL 10)))
(ITALICFONT 1 (HELVETICA 12 MIR)
(GACHA 10 MIR)
(MODERN 10 MIR)
(POSTSCRIPT (MODERN 10 MIR)))
(BOLDFONT 2 (HELVETICA 12 BRR)
(HELVETICA 10 BRR)
(MODERN 10 BRR)
(POSTSCRIPT (HELVETICA 12 BRR)))
(LITTLEFONT 3 (HELVETICA 10)
(HELVETICA 6 MIR)
(MODERN 10 MIR)
(POSTSCRIPT (MODERN 10 MIR)))
(TINYFONT 6 (GACHA 10)
(GACHA 6)
(TERMINAL 6)
(POSTSCRIPT (TERMINAL 6)))
(BIGFONT 4 (HELVETICA 12 BRR)
NIL
(MODERN 12 BRR)
(POSTSCRIPT (MODERN 12 BRR)))
(MENUFONT 5 (HELVETICA 12)
(HELVETICA 12)
(POSTSCRIPT (HELVETICA 12)))
(COMMENTFONT 6 (HELVETICA 12)
(HELVETICA 10)
(MODERN 10)
(POSTSCRIPT (MODERN 10)))
(TEXTFONT 7 (TIMESROMAN 12)
NIL
(CLASSIC 12)
(POSTSCRIPT (CLASSIC 12])
(ADDTOVAR FONTDEFS )
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1949 2774 (INTERLISPMODE 1959 . 2772)))))
(FILEMAP (NIL (1986 2811 (INTERLISPMODE 1996 . 2809)))))
STOP

Binary file not shown.

1
release_trigger Normal file
View File

@@ -0,0 +1 @@
release trigger

View File

@@ -1,10 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "25-Oct-2022 12:19:14" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;11 9572
(FILECREATED "22-Nov-2022 20:50:20" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;10 10271
:CHANGES-TO (FNS MEDLEY-INIT-VARS)
:PREVIOUS-DATE "24-Oct-2022 22:35:01" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;10)
:PREVIOUS-DATE "21-Nov-2022 17:31:30" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;9
)
(PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -33,7 +34,11 @@
(DEFINEQ
(MEDLEY-INIT-VARS
[LAMBDA (EVENT) (* ; "Edited 25-Oct-2022 12:18 by lmm")
[LAMBDA (EVENT) (* ; "Edited 22-Nov-2022 20:38 by FGH")
(* ; "Edited 21-Nov-2022 17:31 by FGH")
(* ; "Edited 21-Nov-2022 15:39 by frank")
(* ; "Edited 21-Nov-2022 14:33 by FGH")
(* ; "Edited 25-Oct-2022 12:18 by lmm")
(* ; "Edited 18-Oct-2022 18:08 by lmm")
(* ;; "Called on events including before & after loadup")
@@ -52,9 +57,8 @@
[SETQ \SAVE.MEDLEYDIR (CONS MEDLEYDIR (FOR X IN MEDLEY-INIT-VARS
COLLECT (CONS (CAR X)
(GETTOPVAL (CAR X])
((AFTERSYSOUT AFTERMAKESYS AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL)
(* ;;
((AFTERSYSOUT AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL)
(* ;;
 "Any old values, restore them, substituting the new MEDLEYDIR")
(PROG (OLDMD NEWMD SAME TMP)
@@ -81,6 +85,12 @@
ELSE (MEDLEYSUBSTDIR OLDMD NEWMD (CDR TMP]
(SETQ \SAVE.MEDLEYDIR T) (* ; "only use once")
))
((GREET)
(SETQ MEDLEYDIR)
(SETQ MEDLEYDIR (MEDLEYDIR))
[for X in MEDLEY-INIT-VARS do (/SETTOPVAL (CAR X)
(EVAL (CADR X]
(SETQ \SAVE.MEDLEYDIR T))
(PROGN (* ; "no changes")
NIL])
@@ -191,6 +201,6 @@
(ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1459 7197 (MEDLEY-INIT-VARS 1469 . 4258) (MEDLEYDIR 4260 . 6215) (MEDLEYSUBSTDIR 6217
. 7195)))))
(FILEMAP (NIL (1469 7896 (MEDLEY-INIT-VARS 1479 . 4957) (MEDLEYDIR 4959 . 6914) (MEDLEYSUBSTDIR 6916
. 7894)))))
STOP

Binary file not shown.