Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/buildLoadup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
27 changes: 1 addition & 26 deletions .github/workflows/doHCFILES.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions loops
Submodule loops added at 8508dd
1 change: 1 addition & 0 deletions maiko
Submodule maiko added at d791b1
1 change: 1 addition & 0 deletions notecards
Submodule notecards added at 32defa
1 change: 1 addition & 0 deletions online
Submodule online added at 9ae1f1
17 changes: 9 additions & 8 deletions scripts/make-gh-pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ 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
git clone --recurse-submodules https://github.com/Interlisp/medley
```

Or, if you already have a clone:

cp -r notecards loops test medley
rm -rf notecards/.git loops/.git test/.git
```
git submodule update --init --recursive
```

This will populate notecards, loops, test (and maiko) inside the medley directory.

# making the .pdfs and index.html files

Expand Down Expand Up @@ -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 change: 1 addition & 0 deletions test
Submodule test added at 9f6d26