Skip to content
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.

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

improve host toolchain #5639 #5643

Merged
merged 9 commits into from
Sep 25, 2024
Merged

improve host toolchain #5639 #5643

merged 9 commits into from
Sep 25, 2024

Conversation

waruqi
Copy link
Member

@waruqi waruqi commented Sep 20, 2024

@waruqi waruqi added this to the v2.9.6 milestone Sep 20, 2024
@waruqi waruqi closed this Sep 23, 2024
@waruqi waruqi reopened this Sep 23, 2024
@waruqi
Copy link
Member Author

waruqi commented Sep 23, 2024

一些改动:

  1. 添加 xmake f --toolchain_host=xrepo install --toolchain_host= 参数可以单独指定包的 host 工具链
  2. 默认情况下,host 包不再使用 xmake f --toolchain= 指定的工具链
  3. binary/toolchain 包内部的所有 add_deps 配置的依赖,默认继承为 host 包,不再需要手动配置 add_deps("xx", {host = true})
  4. 相同配置的 private 包,不再重复安装,共享一个安装包。

@waruqi
Copy link
Member Author

waruqi commented Sep 23, 2024

Some changes:

Adding parameters such as xmake f --toolchain_host= and xrepo install --toolchain_host= allows specifying the host toolchain of a package separately.
By default, host packages no longer use the toolchain specified by xmake f --toolchain=.
For all dependencies configured by add_deps inside binary/toolchain packages, they are inherited as host packages by default and there is no longer a need to manually configure add_deps("xx", {host = true}).
For private packages with the same configuration, they are no longer installed repeatedly and share a single installation package.

@waruqi
Copy link
Member Author

waruqi commented Sep 23, 2024

This patch may introduce some unknown issues and requires some more detailed testing.

@SirLynix
Copy link
Member

I tried to test it but my CI fails, I don't know how to debug it: https://github.com/NazaraEngine/NazaraEngine/actions/runs/11001885174/job/30547585365

@waruqi
Copy link
Member Author

waruqi commented Sep 24, 2024

I tried to test it but my CI fails, I don't know how to debug it: https://github.com/NazaraEngine/NazaraEngine/actions/runs/11001885174/job/30547585365

old issue, you need add sleep after xmake update

    - name: Configure xmake and install dependencies
      run: |
        xmake update -s toolchain
        sleep 5 <----------------------------------------
        xmake repo --update
        xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --static=${{ matrix.kind == 'static' && 'yes' || 'no' }} --ccache=n --ffmpeg=y --shadernodes=y --tests=y --unitybuild=y --yes

@waruqi
Copy link
Member Author

waruqi commented Sep 24, 2024

win, wasm, linux work now, but there are some other errors on macos, https://github.com/waruqi/NazaraEngine/actions

But I am not sure if it is a problem with xmake.

@SirLynix
Copy link
Member

🤔 I don't see any error on macOS

@waruqi
Copy link
Member Author

waruqi commented Sep 25, 2024

🤔 I don't see any error on macOS

I rerun it, it works on ci. If no problem, I am going to merge it.

@waruqi waruqi merged commit 2a4c217 into dev Sep 25, 2024
38 checks passed
@waruqi waruqi deleted the toolchain branch September 25, 2024 07: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