Skip to content

Commit 073db6f

Browse files
committed
Remove unfloader devcontainer
It does not work. Remove develop branch from publish It breaks things. Improve tests for website publish Fix build Rename devcontainer base as we currently only support the SC64, and even if we supported others, can use the same devcontainer. Remove flashcart-other devcontainer It currently serves no purpose. Use separate bash history for dev containers. Rename flashcart-all devcontainer to flashcart-other
1 parent d0e77ab commit 073db6f

File tree

9 files changed

+8
-108
lines changed

9 files changed

+8
-108
lines changed

.devcontainer/doc-builder/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"PATH": "${containerEnv:PATH}:/root/.dotnet/tools"
88
},
99
"mounts": [
10-
"source=n64flashcartmenu-bashhistory,target=/commandhistory,type=volume"
10+
"source=n64flashcartmenu-docbuilder-bashhistory,target=/commandhistory,type=volume"
1111
],
1212
"postCreateCommand": "dotnet tool update -g docfx && git submodule update --init && cd ./libdragon && make clobber -j && make libdragon tools -j",
1313
"customizations": {

.devcontainer/flashcart-all/Dockerfile.all

Lines changed: 0 additions & 23 deletions
This file was deleted.

.devcontainer/flashcart-all/devcontainer.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

.devcontainer/flashcart-unfloader/Dockerfile.unfloader

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/flashcart-unfloader/devcontainer.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

.devcontainer/flashcart-sc64deployer/Dockerfile.sc64deployer renamed to .devcontainer/flashcart/Dockerfile.sc64deployer

File renamed without changes.

.devcontainer/flashcart-sc64deployer/devcontainer.json renamed to .devcontainer/flashcart/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "N64FlashcartMenu-SC64Deployer",
2+
"name": "N64FlashcartMenu-sc64deployer",
33
"build": {
44
"dockerfile": "Dockerfile.sc64deployer"
55
},
66
"mounts": [
7-
"source=n64flashcartmenu-bashhistory,target=/commandhistory,type=volume"
7+
"source=n64flashcartmenu-flashcart-bashhistory,target=/commandhistory,type=volume"
88
],
99
"postCreateCommand": "git submodule update --init && cd ./libdragon && make clobber -j && make libdragon tools -j && make install tools-install -j",
1010
"customizations": {

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
- name: Build N64FlashcartMenu ROM
3131
uses: devcontainers/ci@v0.3
3232
with:
33-
imageName: ghcr.io/polprzewodnikowy/n64flashcartmenu-devcontainer
34-
cacheFrom: ghcr.io/polprzewodnikowy/n64flashcartmenu-devcontainer
35-
configFile: .devcontainer/flashcart-all/devcontainer.json
33+
imageName: ghcr.io/polprzewodnikowy/n64flashcartmenu-flashcart-devcontainer
34+
cacheFrom: ghcr.io/polprzewodnikowy/n64flashcartmenu-flashcart-devcontainer
35+
configFile: .devcontainer/flashcart/devcontainer.json
3636
push: ${{ github.repository_owner == 'Polprzewodnikowy' && 'filter' || 'never' }}
3737
refFilterForPush: refs/heads/main
3838
runCmd: |

docs/99_developer_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You will need to download a copy of the `sc64deployer` from [here](https://githu
3939
> Toggle the N64 POWER switch to load and run the ROM.
4040
4141
#### From within the devcontainer
42-
Select the `flashcart-all` or `flashcart-sc64deployer` dev container.
42+
Select the `flashcart-sc64deployer` dev container.
4343
4444
##### To the native OS
4545
It is not currently possible to directly communicate with USB devices from a devcontainer. BUT, you can use a proxy TCP/IP connection as a workaround.
@@ -138,7 +138,7 @@ This repo currently uses the `preview` branch as a submodule at a specific commi
138138
Or rebuild the dev container.
139139
140140
### Generate documentation
141-
Select the `doc-builder` dev container.
141+
Select the `N64FlashcartMenu-docbuilder` dev container.
142142
Run `doxygen` from the dev container terminal to generate the source documentation:
143143
144144
```bash

0 commit comments

Comments
 (0)