diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7aeab6340a..105d4d2cda5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,8 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Install dependencies + run: sudo apt-get install meson # On push to master, increment patch version and create a new tag on release - name: Increment patch version if: github.event_name == 'push' && github.ref == 'refs/heads/master' diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index cd12ea384fd..08d6e4e2479 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -33,6 +33,8 @@ submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloa submodules="$submodules ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash tomlplusplus genconfig" submodules="$submodules hw/xbox/nv2a/pgraph/thirdparty/nv2a_vsh_cpu" +subprojects="glslang SPIRV-Reflect volk VulkanMemoryAllocator" + sub_deinit="" function cleanup() { @@ -56,6 +58,14 @@ function tree_ish() { git archive --format tar "$(tree_ish)" > "$tar_file" test $? -ne 0 && error "failed to archive qemu" + +for sp in $subprojects; do + meson subprojects download $sp + # test $? -ne 0 && error "failed to download subproject $sp" + tar --append --file "$tar_file" --exclude=.git subprojects/$sp + test $? -ne 0 && error "failed to append subproject $sp to $tar_file" +done + for sm in $submodules; do status="$(git submodule status "$sm")" smhash="${status#[ +-]}"