diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34cac5f..ee4b3d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5ed5ef..1b47dc9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 diff --git a/Jamfile b/Jamfile index ebcc032..cc21844 100644 --- a/Jamfile +++ b/Jamfile @@ -1,7 +1,7 @@ SubDir coco-test ; -disk = [ FDirName $(TOP) craigtst.dsk ] ; +disk = [ FDirName $(SUBDIR) craigtst.dsk ] ; ASM = [ Glob $(SUBDIR) : *.asm ] ; diff --git a/Jamrules b/Jamrules index fac6737..80d6dad 100644 --- a/Jamrules +++ b/Jamrules @@ -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 ] ; } diff --git a/README.md b/README.md index 27a714a..1de9a78 100644 --- a/README.md +++ b/README.md @@ -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 @@ -71,8 +71,8 @@ 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 @@ -80,16 +80,7 @@ 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