1
0
mirror of synced 2026-03-16 15:17:05 +00:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Larry Masinter
5a24a52819 Update CI and docs to use submodules for maiko/notecards/loops/test
doHCFILES.yml: replace 5 separate checkout steps with a single
  checkout using submodules:true; remove now-redundant .git cleanup step.

buildLoadup.yml: add submodules:true to Checkout Medley; remove
  separate Checkout Notecards + tar steps (notecards.tgz was already
  commented out of the release push).

make-gh-pages.md: replace manual clone+copy instructions with
  git clone --recurse-submodules; remove rm -rf of submodule dirs.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-08 19:45:39 -07:00
Larry Masinter
34dfed15a1 Add online as git submodule
Adds Interlisp/online pinned to current HEAD of main, consistent
with the other submodules added in this branch.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-08 19:30:38 -07:00
Larry Masinter
6196019fcf Add maiko, notecards, loops, test as git submodules
Removes maiko/ from .gitignore so it can be tracked as a submodule.
Each submodule is pinned to the current HEAD of its default branch
(master for maiko/test, main for notecards/loops).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-08 13:25:58 -07:00
10 changed files with 38 additions and 50 deletions

View File

@@ -124,6 +124,8 @@ jobs:
# Checkout latest commit
- name: Checkout Medley
uses: actions/checkout@v4
with:
submodules: true
# Setup release tag
- name: Setup Release Tag
@@ -191,18 +193,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
# Checkout Notecards and tar it in the tarballsdir
- name: Checkout Notecards
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/notecards
path: ./notecards
- name: Tar notecards into tarball dir
run: |
mv ./notecards ../notecards
cd ../notecards
git archive --format=tgz --output="${TARBALL_DIR}/notecards.tgz" --prefix=notecards/ main
# Install vnc
- name: Install vnc
run: sudo apt-get update && sudo apt-get install -y tightvncserver

View File

@@ -51,33 +51,8 @@ jobs:
- name: Checkout Medley repo
uses: actions/checkout@v4
- name: Checkout maiko
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/maiko
path: ./maiko
- name: Checkout notecards
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/notecards
path: ./notecards
- name: Checkout loops
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/loops
path: ./loops
- name: Checkout test
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/test
path: ./test
- name: Cleanup .git for notecards, loops, test
run: rm -rf ./notecards/.git ./loops/.git ./test/.git
submodules: true
- name: Download Maiko
run: |

3
.gitignore vendored
View File

@@ -5,9 +5,6 @@ tmp/*
# releases directory
releases/*
# maiko directory
maiko/
# all PDFs (those explicitly checked in aren't ignored
# normally when you have derived files, you ignore them from git

20
.gitmodules vendored
View File

@@ -0,0 +1,20 @@
[submodule "maiko"]
path = maiko
url = https://github.com/Interlisp/maiko
branch = master
[submodule "notecards"]
path = notecards
url = https://github.com/Interlisp/notecards
branch = main
[submodule "loops"]
path = loops
url = https://github.com/Interlisp/loops
branch = main
[submodule "test"]
path = test
url = https://github.com/Interlisp/test
branch = master
[submodule "online"]
path = online
url = https://github.com/Interlisp/online
branch = main

1
loops Submodule

Submodule loops added at 8508dd0d9a

1
maiko Submodule

Submodule maiko added at d791b1d332

1
notecards Submodule

Submodule notecards added at 32defaee14

1
online Submodule

Submodule online added at 9ae1f13088

View File

@@ -5,18 +5,20 @@ HCFILES writes in {MEDLEYDIR} but it should write in something like (SRCDIR)
## Remove extraneous files
There are lots of ways to get there but basically set up the execution environment with everything clean but notecards loops, test are copied in. If you don't make fresh, at least 'git clean'.
There are lots of ways to get there but basically set up the execution environment with everything clean. If you don't make fresh, at least 'git clean'.
```
gh repo clone interlisp/medley
gh repo clone interlisp/notecards
gh repo clone interlisp/loops
gh repo clone interlisp/test
cp -r notecards loops test medley
rm -rf notecards/.git loops/.git test/.git
git clone --recurse-submodules https://github.com/Interlisp/medley
```
Or, if you already have a clone:
```
git submodule update --init --recursive
```
This will populate notecards, loops, test (and maiko) inside the medley directory.
# making the .pdfs and index.html files
## best start with a fresh loadup
@@ -62,6 +64,5 @@ after you've done this, you can clean up (from the medley folder):
```
find . -iname "*.pdf" -exec rm {} \;
git remote set-url --push https://github.com/Interlisp/medley
rm -rf loops notecards test
```

1
test Submodule

Submodule test added at 9f6d26f719