mirror of
https://github.com/RGBCube/serenity
synced 2025-07-29 20:37:35 +00:00
Meta+CMake: Remove "image" ninja target in favor of "qemu-image"
"image" was an alias for "qemu-image". I want to add an `image` userland utility, which clashes with that shortname. So remove the existing "image" target. It was just an alias for "qemu-image". If you use serenity.sh to build, nothing changes. This only affects you if you run ninja manually -- you now have to say `ninja qemu-image` to build the disk image.
This commit is contained in:
parent
952222ec4d
commit
3cff36b7ab
5 changed files with 6 additions and 10 deletions
4
.github/workflows/cmake.yml
vendored
4
.github/workflows/cmake.yml
vendored
|
@ -194,7 +194,7 @@ jobs:
|
|||
- name: Create Serenity Rootfs
|
||||
if: ${{ matrix.debug-options == 'NORMAL_DEBUG'}}
|
||||
working-directory: ${{ github.workspace }}/Build/${{ matrix.arch }}
|
||||
run: ninja install && ninja image
|
||||
run: ninja install && ninja qemu-image
|
||||
|
||||
- name: Run On-Target Tests
|
||||
if: ${{ matrix.debug-options == 'NORMAL_DEBUG'}}
|
||||
|
@ -236,6 +236,6 @@ jobs:
|
|||
run: |
|
||||
# Running the tests apparently leaves the image sufficiently broken
|
||||
rm _disk_image
|
||||
ninja image
|
||||
ninja qemu-image
|
||||
/usr/bin/time ../../Meta/export-argsparser-manpages.sh --verify-git-state
|
||||
timeout-minutes: 10
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue