diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c83b8aad..24723c9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: - name: Download uncached images if: steps.cache-images.outputs.cache-hit != 'true' - run: wget -nv -P images/ https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img} + run: mkdir -p images && curl --compressed --output-dir images --remote-name-all https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img,msdos622.img} - name: Run api-tests run: make api-tests diff --git a/Readme.md b/Readme.md index 8fe1dd64..90e9062f 100644 --- a/Readme.md +++ b/Readme.md @@ -148,7 +148,7 @@ for a full setup on Debian or The disk images for testing are not included in this repository. You can download them directly from the website using: -`wget -P images/ https://i.copy.sh/{linux3.iso,linux.iso,linux4.iso,buildroot-bzimage68.bin,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img}` +`curl --compressed --output-dir images/ --remote-name-all https://i.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage68.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,mobius-fd-release5.img,msdos622.img}` Run integration tests: `make tests` diff --git a/tests/full/run.js b/tests/full/run.js index 1efbb22a..ad546a44 100755 --- a/tests/full/run.js +++ b/tests/full/run.js @@ -280,7 +280,6 @@ if(cluster.isPrimary) }, { name: "MS-DOS", - skip_if_disk_image_missing: true, hda: root_path + "/images/msdos.img", timeout: 90, expected_texts: [ @@ -289,7 +288,6 @@ if(cluster.isPrimary) }, { name: "MS-DOS (hard disk + floppy disk)", - skip_if_disk_image_missing: true, hda: root_path + "/images/msdos.img", fda: root_path + "/images/kolibri.img", boot_order: 0x132,