Skip to content

Update to tool shed 2.4.1 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
callsop merged 1 commit into from
Jul 21, 2025
Merged

Update to tool shed 2.4.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
uses: robinraju/release-downloader@v1
with:
repository: nitros9project/toolshed
fileName: toolshed-*.tgz
fileName: toolshed-unix*.tgz
latest: true
extract: false
out-file-path: toolshed

- name: Install Toolshed
run: |
sudo tar xvf toolshed/toolshed-[0-9]*.*.tgz --strip-components=1 -C /usr/local/bin
sudo tar xvf toolshed/toolshed-unix*.tgz --strip-components=1 -C /usr/local/bin
sudo ln -s /bin/bash /usr/local/bin/xroar

- name: Install Lwtools
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
uses: robinraju/release-downloader@v1
with:
repository: nitros9project/toolshed
fileName: toolshed-*.tgz
fileName: toolshed-unix*.tgz
latest: true
extract: false
out-file-path: toolshed

- name: Install Toolshed
run: |
sudo tar xvf toolshed/toolshed-[0-9]*.*.tgz --strip-components=1 -C /usr/local/bin
sudo tar xvf toolshed/toolshed-unix*.tgz --strip-components=1 -C /usr/local/bin
sudo ln -s /bin/bash /usr/local/bin/xroar

- name: Install Lwtools
Expand All @@ -55,10 +55,11 @@ jobs:
run: ls -al

- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: "craigtst-*.tgz"
files: |
craigtst-*.tgz


2 changes: 1 addition & 1 deletion Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

SubDir coco-test ;

disk = [ FDirName $(TOP) craigtst.dsk ] ;
disk = [ FDirName $(SUBDIR) craigtst.dsk ] ;

ASM = [ Glob $(SUBDIR) : *.asm ] ;

Expand Down
2 changes: 1 addition & 1 deletion Jamrules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if $(OS) = NT

# tool paths
LWTOOLS_PATH = [ FDirName $(TOOL_PATH) lwtools-4.24c ] ;
TOOLSHED_PATH = [ FDirName $(TOOL_PATH) toolshed-2.4 ] ;
TOOLSHED_PATH = [ FDirName $(TOOL_PATH) toolshed-2.4.1 ] ;
VCC_PATH = [ FDirName $(TOOL_PATH) vcc-2.1.9.1 ] ;
XROAR_PATH = [ FDirName $(TOOL_PATH) xroar-1.8.1 ] ;
}
Expand Down
17 changes: 4 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ To build the dsk image require some tools...
### Requirements

- [Jam 2.6.1](https://github.com/callsop/perforce-jam)
- [Toolshed 2.4](https://github.com/nitros9project/toolshed)
- [Toolshed 2.4.1](https://github.com/nitros9project/toolshed)
- [Lwtools 4.24](http://www.lwtools.ca)

#### Linux
Expand All @@ -71,25 +71,16 @@ Jam 2.6.1 is here: https://github.com/callsop/perforce-jam/releases/tag/v2.6.1 j

```
$ jam dsk
...found 18 target(s)...
...updating 5 target(s)...
...found 10 target(s)...
...updating 4 target(s)...
Assemble I1.BIN
Assemble I2.BIN
Assemble I3.BIN
MakeDisk1 craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
Decb craigtst.dsk
...updated 5 target(s)...
...updated 4 target(s)...
```

### Clean
Expand Down