Skip to content

Conversation

@FozzTexx
Copy link
Contributor

Worked on my sandbox repo, hopefully it will work here too.

@markjfisher
Copy link
Contributor

What are the steps that the workflow will take?
Will it overwrite previous releases?
Can you go into a bit of details please so we can discuss.

@FozzTexx
Copy link
Contributor Author

What are the steps that the workflow will take? Will it overwrite previous releases? Can you go into a bit of details please so we can discuss.

The steps are in .github/workflows/ci.yml

Basically if a new tag is pushed then a make release is run, a new release is created which matches the tag name, and then the dist/*.zip files are uploaded individually to that new release.

@markjfisher
Copy link
Contributor

Thanks. That seems fine. So a person would push a change to version.txt and Changelog.md, then push a tag, and the workflow would build the zips.
Does defoogi support MSDOS? That was in the last release, and I would like the apple2enh to be in there too, that's always had a release.

@FozzTexx
Copy link
Contributor Author

defoogi supports MS-DOS but it doesn't look like fujinet-lib does:

wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_open.o msdos/src/fn_network/network_open.c
msdos/src/fn_network/network_open.c(8): Error! E1151: Parameter count does not agree with previous definition
msdos/src/fn_network/network_open.c(8): Note! N2002: 'network_unit' defined in: ./fujinet-network.h(256)
msdos/src/fn_network/network_open.c(10): Warning! W1179: Parameter 5, type qualifier mismatch
msdos/src/fn_network/network_open.c(10): Note! N2003: source conversion type is 'char const *'
msdos/src/fn_network/network_open.c(10): Note! N2004: target conversion type is 'void *'
make[1]: *** [makefiles/build.mk:183: obj/msdos/fn_network/network_open.o] Error 1
make: *** [Makefile:16: all] Error 2

force pushed to turn apple2enh back on

@markjfisher
Copy link
Contributor

markjfisher commented Sep 22, 2025

Must be a regression, I was able to build it previously: https://github.com/FujiNetWIFI/fujinet-lib/releases/tag/v4.7.7
also 4.7.6 and 4.7.5 built fine

@markjfisher
Copy link
Contributor

markjfisher commented Sep 22, 2025

I'm just trying to recreate it locally.
It's a regression. 4.7.7 compiles fine, the HEAD doesn't.

fujinet-lib on  HEAD (d66eaa1) [?] via C v15.2.1-gcc
❯ make TARGETS=msdos release
-------------------------------------
Building msdos
-------------------------------------
find: ‘testing/unit/msdos’: No such file or directory
mkdir -p obj
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5.o msdos/src/bus/int_f5.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5_read.o msdos/src/bus/int_f5_read.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5_write.o msdos/src/bus/int_f5_write.c
...
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/common/util/hex_dump.o common/src/util/hex_dump.c
mkdir -p build
wlib -q build/fujinet.lib.msdos obj/msdos/bus/int_f5.o obj/msdos/bus/int_f5_read.o obj/msdos/bus/int_f5_write.o obj/msdos/fn_fuji/fuji_base64_decode_compute.o obj/msdos/fn_fuji/fuji_base64_decode_input.o obj/msdos/fn_fuji/fuji_base64_decode_length.o obj/msdos/fn_fuji/fuji_base64_decode_output.o obj/msdos/fn_fuji/fuji_base64_encode_compute.o obj/msdos/fn_fuji/fuji_base64_encode_input.o obj/msdos/fn_fuji/fuji_base64_encode_length.o obj/msdos/fn_fuji/fuji_base64_encode_output.o obj/msdos/fn_fuji/fuji_close_directory.o obj/msdos/fn_fuji/fuji_copy_file.o obj/msdos/fn_fuji/fuji_create_new.o obj/msdos/fn_fuji/fuji_disable_device.o obj/msdos/fn_fuji/fuji_enable_device.o obj/msdos/fn_fuji/fuji_enable_udpstream.o obj/msdos/fn_fuji/fuji_error.o obj/msdos/fn_fuji/fuji_get_adapter_config.o obj/msdos/fn_fuji/fuji_get_adapter_config_extended.o obj/msdos/fn_fuji/fuji_get_device_enabled_status.o obj/msdos/fn_fuji/fuji_get_device_filename.o obj/msdos/fn_fuji/fuji_get_device_slots.o obj/msdos/fn_fuji/fuji_get_directory_position.o obj/msdos/fn_fuji/fuji_get_host_prefix.o obj/msdos/fn_fuji/fuji_get_host_slots.o obj/msdos/fn_fuji/fuji_get_hsio_index.o obj/msdos/fn_fuji/fuji_get_scan_result.o obj/msdos/fn_fuji/fuji_get_ssid.o obj/msdos/fn_fuji/fuji_get_wifi_enabled.o obj/msdos/fn_fuji/fuji_get_wifi_status.o obj/msdos/fn_fuji/fuji_hash_clear.o obj/msdos/fn_fuji/fuji_hash_compute.o obj/msdos/fn_fuji/fuji_hash_compute_no_clear.o obj/msdos/fn_fuji/fuji_hash_input.o obj/msdos/fn_fuji/fuji_hash_length.o obj/msdos/fn_fuji/fuji_hash_output.o obj/msdos/fn_fuji/fuji_mount_all.o obj/msdos/fn_fuji/fuji_mount_disk_image.o obj/msdos/fn_fuji/fuji_mount_host_slot.o obj/msdos/fn_fuji/fuji_open_directory2.o obj/msdos/fn_fuji/fuji_open_directory.o obj/msdos/fn_fuji/fuji_put_device_slots.o obj/msdos/fn_fuji/fuji_put_host_slots.o obj/msdos/fn_fuji/fuji_read_appkey.o obj/msdos/fn_fuji/fuji_read_directory.o obj/msdos/fn_fuji/fuji_reset.o obj/msdos/fn_fuji/fuji_scan_for_networks.o obj/msdos/fn_fuji/fuji_set_boot_config.o obj/msdos/fn_fuji/fuji_set_boot_mode.o obj/msdos/fn_fuji/fuji_set_device_filename.o obj/msdos/fn_fuji/fuji_set_directory_position.o obj/msdos/fn_fuji/fuji_set_host_prefix.o obj/msdos/fn_fuji/fuji_set_hsio_index.o obj/msdos/fn_fuji/fuji_set_sio_external_clock.o obj/msdos/fn_fuji/fuji_set_ssid.o obj/msdos/fn_fuji/fuji_set_status.o obj/msdos/fn_fuji/fuji_status.o obj/msdos/fn_fuji/fuji_unmount_disk_image.o obj/msdos/fn_fuji/fuji_unmount_host_slot.o obj/msdos/fn_fuji/fuji_write_appkey.o obj/msdos/fn_network/fn_error.o obj/msdos/fn_network/network_close.o obj/msdos/fn_network/network_http_set_channel_mode.o obj/msdos/fn_network/network_ioctl.o obj/msdos/fn_network/network_json_parse.o obj/msdos/fn_network/network_json_query.o obj/msdos/fn_network/network_open.o obj/msdos/fn_network/network_status.o obj/msdos/fn_network/network_write.o obj/msdos/common/fn_fuji/fn_data.o obj/msdos/common/fn_fuji/fuji_ak_data.o obj/msdos/common/fn_fuji/fuji_hash_add.o obj/msdos/common/fn_fuji/fuji_hash_calculate.o obj/msdos/common/fn_fuji/fuji_hash_data.o obj/msdos/common/fn_fuji/fuji_hash_size.o obj/msdos/common/fn_fuji/fuji_set_appkey_details.o obj/msdos/common/fn_network/network_fs_cd.o obj/msdos/common/fn_network/network_fs_delete.o obj/msdos/common/fn_network/network_fs_lock.o obj/msdos/common/fn_network/network_fs_mkdir.o obj/msdos/common/fn_network/network_fs_pwd.o obj/msdos/common/fn_network/network_fs_rename.o obj/msdos/common/fn_network/network_fs_rmdir.o obj/msdos/common/fn_network/network_fs_unlock.o obj/msdos/common/fn_network/network_http_add_header.o obj/msdos/common/fn_network/network_http_delete.o obj/msdos/common/fn_network/network_http_end_add_headers.o obj/msdos/common/fn_network/network_http_post_bin.o obj/msdos/common/fn_network/network_http_post.o obj/msdos/common/fn_network/network_http_put.o obj/msdos/common/fn_network/network_http_start_add_headers.o obj/msdos/common/fn_network/network_init.o obj/msdos/common/fn_network/network_read.o obj/msdos/common/fn_network/network_read_nb.o obj/msdos/common/fn_network/network_unit.o obj/msdos/common/util/hex_dump.o
mkdir -p dist
cp build/fujinet.lib.msdos dist/fujinet-msdos-4.7.7.lib
cp fujinet-network.h dist/
cp fujinet-network.inc dist/
cp fujinet-fuji.h dist/
cp fujinet-fuji.inc dist/
cp fujinet-clock.h dist/
cp Changelog.md dist/
cd dist && zip fujinet-lib-msdos-4.7.7.zip Changelog.md fujinet-msdos-4.7.7.lib *.h *.inc
  adding: Changelog.md (deflated 61%)
  adding: fujinet-msdos-4.7.7.lib (deflated 90%)
  adding: fujinet-clock.h (deflated 61%)
  adding: fujinet-fuji.h (deflated 73%)
  adding: fujinet-network.h (deflated 76%)
  adding: fujinet-fuji.inc (deflated 71%)
  adding: fujinet-network.inc (deflated 44%)
rm -f dist/fujinet-msdos-*.lib
rm -f dist/Changelog.md
rm -f dist/*.h
rm -f dist/*.inc

fujinet-lib on  HEAD (d66eaa1) via C v15.2.1-gcc
❯ git checkout main
Previous HEAD position was d66eaa1d Release 4.7.7
Switched to branch 'main'
Your branch is ahead of 'origin/main' by 4 commits.
  (use "git push" to publish your local commits)

fujinet-lib on  main [⇡] via C v15.2.1-gcc
❯ make TARGETS=msdos release
-------------------------------------
Building msdos
-------------------------------------
find: ‘testing/unit/msdos’: No such file or directory
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5.o msdos/src/bus/int_f5.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5_read.o msdos/src/bus/int_f5_read.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/bus/int_f5_write.o msdos/src/bus/int_f5_write.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_fuji/fuji_hash_clear.o msdos/src/fn_fuji/fuji_hash_clear.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/fn_error.o msdos/src/fn_network/fn_error.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_close.o msdos/src/fn_network/network_close.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_http_set_channel_mode.o msdos/src/fn_network/network_http_set_channel_mode.c
msdos/src/fn_network/network_http_set_channel_mode.c(8): Warning! W131: No prototype found for function 'int_f5'
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_ioctl.o msdos/src/fn_network/network_ioctl.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_json_parse.o msdos/src/fn_network/network_json_parse.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_json_query.o msdos/src/fn_network/network_json_query.c
wcc -zq -D__MSDOS__ -i=common/inc -i=msdos/src/include -i=. -fo=obj/msdos/fn_network/network_open.o msdos/src/fn_network/network_open.c
msdos/src/fn_network/network_open.c(8): Error! E1151: Parameter count does not agree with previous definition
msdos/src/fn_network/network_open.c(8): Note! N2002: 'network_unit' defined in: ./fujinet-network.h(256)
msdos/src/fn_network/network_open.c(10): Warning! W1179: Parameter 5, type qualifier mismatch
msdos/src/fn_network/network_open.c(10): Note! N2003: source conversion type is 'char const *'
msdos/src/fn_network/network_open.c(10): Note! N2004: target conversion type is 'void *'
make[1]: *** [makefiles/build.mk:183: obj/msdos/fn_network/network_open.o] Error 1
make: *** [Makefile:15: all] Error 2

@markjfisher
Copy link
Contributor

I've asked @tschak909 to have a look as it was this change that broke the build:

* 06c0bb49 2025-08-20 | [msdos] implement network. (#31) [Thomas Cherryhomes]

@FozzTexx
Copy link
Contributor Author

I've asked @tschak909 to have a look as it was this change that broke the build:

I already made a PR

#36

Copy link
Contributor

@markjfisher markjfisher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, even did the job in the MR

@markjfisher markjfisher merged commit ab38c4a into main Sep 22, 2025
9 checks passed
@markjfisher markjfisher deleted the feature/ci-workflow branch September 22, 2025 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants