language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Packaging: Fix up windows artifact names

Browse source 
For the slint-compiler, we use ${CMAKE_SYSTEM_PROCESSOR}, which on Windows is - unfortunately - derived from the PROCESSOR_ARCHITECTURE environment variable, and
thus AMD64 or ARM64. Fix the package suffix on the CI side.

We could try to make the cmake variable to known values and then arm64/x86_64, but I'd rather stick with less exceptions when these names are not really visible in the documentation or our users.

The same applies to the C++ packages, where the CMake/Windows suffix (AMD64/ARM64) works better with FindSlint.cmake's use of the corresponding variable.

Similarly, the tool binaries were called
slint-viewer-windows-aarch64-pc-windows-msvc, but neither the compiler, nor the rest of the triplet is needed, merely the architecture. So rename it to slint-viewer-windows-arm64 and x86_64. Here we don't need cmake and can use the "correct" suffixes.
This commit is contained in:
Simon Hausmann 2025-06-17 11:27:25 +02:00 • committed by Simon Hausmann
parent 04d2d2e8b9
commit 54bb2d39ad
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/cpp_package.yaml vendored
View file

@ -249,11 +249,11 @@ jobs:
package_suffix: Darwin-arm64
cargo_target: aarch64-apple-darwin
- os: windows-2022
package_suffix: Windows-x86_64
package_suffix: Windows-AMD64
msvc_arch: x64
cargo_target: x86_64-pc-windows-gnu
- os: windows-11-arm
package_suffix: Windows-arm64
package_suffix: Windows-ARM64
msvc_arch: arm64
cargo_target: aarch64-pc-windows-gnu

4
.github/workflows/slint_tool_binary.yaml vendored
View file

@ -61,8 +61,10 @@ jobs:
include:
- arch: x86_64-pc-windows-msvc
runner: windows-2022
package_suffix: x86_64
- arch: aarch64-pc-windows-msvc
runner: windows-11-arm
package_suffix: arm64
runs-on: ${{ matrix.runner}}
steps:
@ -91,7 +93,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: slint-${{ github.event.inputs.program || inputs.program }}-windows-${{ matrix.arch }}
name: slint-${{ github.event.inputs.program || inputs.program }}-windows-${{ matrix.package_suffix }}
path: |
pkg

2
api/cpp/esp-idf/slint/cmake/FindSlint.cmake
View file

@ -36,7 +36,7 @@ if (NOT SLINT_TARGET_ARCHITECTURE)
else()
set(CPACK_SYSTEM_NAME win32)
endif()
set(SLINT_TARGET_ARCHITECTURE "${CPACK_SYSTEM_NAME}${compiler_suffix}")
set(SLINT_TARGET_ARCHITECTURE "${CPACK_SYSTEM_NAME}${compiler_suffix}-${CMAKE_SYSTEM_PROCESSOR}")
elseif (CONFIG_IDF_TARGET_ARCH_XTENSA)
set(SLINT_TARGET_ARCHITECTURE "xtensa-${IDF_TARGET}-none-elf")
elseif(CONFIG_IDF_TARGET_ARCH_RISCV)

12
docs/release-artifacts.md
View file

@ -11,8 +11,8 @@ For C++ developers, this release contains the following pre-packed builds of Sli
| Linux | gcc | x86-64 | [Slint-cpp-{version}-Linux-x86_64.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-Linux-x86_64.tar.gz) |
| Linux | gcc | arm64 | [Slint-cpp-{version}-Linux-arm64.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-Linux-arm64.tar.gz) |
| Linux | gcc | armhf | [Slint-cpp-{version}-Linux-armhf.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-Linux-armhf.tar.gz) |
| Windows | MSVC | x86-64 | [Slint-cpp-{version}-win64-MSVC-x86_64.exe](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-win64-MSVC-x86_64.exe) |
| Windows | MSVC | arm64 | [Slint-cpp-{version}-win64-MSVC-arm64.exe](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-win64-MSVC-arm64.exe) |
| Windows | MSVC | x86-64 | [Slint-cpp-{version}-win64-MSVC-AMD64.exe](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-win64-MSVC-AMD64.exe) |
| Windows | MSVC | arm64 | [Slint-cpp-{version}-win64-MSVC-ARM64.exe](https://github.com/slint-ui/slint/releases/download/{download_version}/Slint-cpp-{version}-win64-MSVC-ARM64.exe) |
| Templates for Microcontroller Evaluation Board | Download |
|----------------------------------|----------|
@ -21,7 +21,7 @@ For C++ developers, this release contains the following pre-packed builds of Sli
## Tool Binaries
| Add-on | Linux x86-64 | Windows (x86-64) | macOS (universal) | Linux aarch64 | Linux armv7 |
|-----------|--------------|---------|-------|-------|-------|
| **slint-lsp** | [slint-lsp-linux.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-linux.tar.gz) | [slint-lsp-windows.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-windows.zip) | [slint-lsp-macos.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-macos.tar.gz) | [slint-lsp-aarch64-unknown-linux-gnu.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-aarch64-unknown-linux-gnu.tar.gz) | [slint-lsp-armv7-unknown-linux-gnueabihf.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-armv7-unknown-linux-gnueabihf.tar.gz)
| **slint-viewer** | [slint-viewer-linux.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-linux.tar.gz) | [slint-viewer-windows.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-windows.zip) | [slint-viewer-macos.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-macos.tar.gz) | [slint-viewer-aarch64-unknown-linux-gnu.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-aarch64-unknown-linux-gnu.tar.gz) | [slint-viewer-armv7-unknown-linux-gnueabihf.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-armv7-unknown-linux-gnueabihf.tar.gz)
| Add-on | Linux x86-64 | Windows (x86-64) | Windows (aarch64) | macOS (universal) | Linux aarch64 | Linux armv7 |
|-----------|--------------|---------|-------|-------|-------|-------|
| **slint-lsp** | [slint-lsp-linux.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-linux.tar.gz) | [slint-lsp-windows-x86_64.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-windows-x86_64.zip) | [slint-lsp-windows-arm64.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-windows-arm64.zip) | [slint-lsp-macos.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-macos.tar.gz) | [slint-lsp-aarch64-unknown-linux-gnu.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-aarch64-unknown-linux-gnu.tar.gz) | [slint-lsp-armv7-unknown-linux-gnueabihf.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-lsp-armv7-unknown-linux-gnueabihf.tar.gz)
| **slint-viewer** | [slint-viewer-linux.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-linux.tar.gz) | [slint-viewer-windows-x86_64.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-windows-x86_64.zip) | [slint-viewer-windows-arm64.zip](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-windows-arm64.zip) | [slint-viewer-macos.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-macos.tar.gz) | [slint-viewer-aarch64-unknown-linux-gnu.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-aarch64-unknown-linux-gnu.tar.gz) | [slint-viewer-armv7-unknown-linux-gnueabihf.tar.gz](https://github.com/slint-ui/slint/releases/download/{download_version}/slint-viewer-armv7-unknown-linux-gnueabihf.tar.gz)