Skip to content

Update from deprecated artefacts #78

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
pulkomandy merged 2 commits into from
Jun 10, 2025
Merged

Update from deprecated artefacts #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfdc18f
Update from deprecated artefacts
pulkomandy Jun 10, 2025
0ffee14
Update to libdsk 1.5.21
pulkomandy Jun 10, 2025
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
22 changes: 11 additions & 11 deletions .github/workflows/build_cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
os: windows-2019,
build_type: "Release", cc: "cl", cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvarsall.bat",
libdsk_outfiles: "libdsk-1.5.19/win32vc6/Release/libdsk.lib libdsk-1.5.19/win32vc6/Release/libdsk.dll",
libdsk_outfiles: "libdsk-1.5.21/win32vc6/Release/libdsk.lib libdsk-1.5.21/win32vc6/Release/libdsk.dll",
libdir: "instdir/bin",
}
- {
Expand Down Expand Up @@ -54,21 +54,21 @@ jobs:
id: libdsk
shell: cmake -P {0}
run: |
file(DOWNLOAD "https://www.seasip.info/Unix/LibDsk/libdsk-1.5.19.tar.gz" ./libdsk.tar.gz SHOW_PROGRESS)
file(DOWNLOAD "https://www.seasip.info/Unix/LibDsk/libdsk-1.5.21.tar.gz" ./libdsk.tar.gz SHOW_PROGRESS)
file(MAKE_DIRECTORY /tmp/deps/libdsk)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./libdsk.tar.gz)
if ("${{ runner.os }}" STREQUAL "Windows")
execute_process(COMMAND "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\devenv.exe" win32vc6/libdsk.dsp /upgrade
WORKING_DIRECTORY libdsk-1.5.19 COMMAND_ERROR_IS_FATAL ANY)
WORKING_DIRECTORY libdsk-1.5.21 COMMAND_ERROR_IS_FATAL ANY)
execute_process(COMMAND "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\devenv.exe" win32vc6/libdsk.vcxproj /Build Release
WORKING_DIRECTORY libdsk-1.5.19 COMMAND_ERROR_IS_FATAL ANY)
WORKING_DIRECTORY libdsk-1.5.21 COMMAND_ERROR_IS_FATAL ANY)
else()
execute_process(COMMAND ./configure --prefix /tmp/deps/libdsk
WORKING_DIRECTORY libdsk-1.5.19 COMMAND_ERROR_IS_FATAL ANY)
WORKING_DIRECTORY libdsk-1.5.21 COMMAND_ERROR_IS_FATAL ANY)
execute_process(COMMAND make
WORKING_DIRECTORY libdsk-1.5.19 COMMAND_ERROR_IS_FATAL ANY)
WORKING_DIRECTORY libdsk-1.5.21 COMMAND_ERROR_IS_FATAL ANY)
execute_process(COMMAND make install
WORKING_DIRECTORY libdsk-1.5.19 COMMAND_ERROR_IS_FATAL ANY)
WORKING_DIRECTORY libdsk-1.5.21 COMMAND_ERROR_IS_FATAL ANY)
endif()

- name: Configure CPCTools
Expand All @@ -89,8 +89,8 @@ jobs:
endif()
endforeach()

set(LIBDSK_LIB "D:\\a\\cpctools\\cpctools\\libdsk-1.5.19\\win32vc6\\Release")
set(LIBDSK_INC "D:\\a\\cpctools\\cpctools\\libdsk-1.5.19\\include")
set(LIBDSK_LIB "D:\\a\\cpctools\\cpctools\\libdsk-1.5.21\\win32vc6\\Release")
set(LIBDSK_INC "D:\\a\\cpctools\\cpctools\\libdsk-1.5.21\\include")
set(CMAKE_ARGS -G "Visual Studio 16 2019" -A Win32)
else()
set(LIBDSK_LIB "/tmp/deps/libdsk/lib")
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
endif()

- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
path: ./instdir
name: ${{ matrix.config.artifact }}
Expand All @@ -175,7 +175,7 @@ jobs:
run: |
echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url

- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v4
with:
path: ./upload_url
name: upload_url
Expand Down
Loading