Skip to content

Commit 188f9ad

Browse files
use cbake actions
1 parent c35dbc0 commit 188f9ad

File tree

1 file changed

+12
-37
lines changed

1 file changed

+12
-37
lines changed

.github/workflows/nuget.yml

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -131,38 +131,21 @@ jobs:
131131
echo "IPHONEOS_DEPLOYMENT_TARGET=12.1" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
132132
}
133133
134-
- name: Install clang+llvm
134+
- name: Setup LLVM
135+
uses: Devolutions/actions-public/setup-llvm@cbake
135136
if: matrix.os == 'linux'
136-
shell: pwsh
137-
run: |
138-
$ClangLlvmVersion='18.1.8'
139-
$ClangLlvmArch='x86_64'
140-
$ClangLlvmPlatform=@{'win'='windows';'osx'='macos';'linux'='ubuntu-22.04'}['${{matrix.os}}']
141-
$ClangLlvmBaseUrl="https://github.com/awakecoding/llvm-prebuilt/releases/download/v2025.2.0"
142-
$ClangLlvmName="clang+llvm-${ClangLlvmVersion}-${ClangLlvmArch}-${ClangLlvmPlatform}"
143-
wget -q "${ClangLlvmBaseUrl}/${ClangLlvmName}.tar.xz"
144-
$LLVM_PREFIX="/opt/llvm"
145-
tar -xf "${ClangLlvmName}.tar.xz" -C /tmp
146-
sudo mv "/tmp/${ClangLlvmName}" $LLVM_PREFIX
147-
$LLVM_BIN_PATH="$LLVM_PREFIX/bin"
148-
echo "PATH=$LLVM_BIN_PATH$([IO.Path]::PathSeparator)$Env:PATH" >> $Env:GITHUB_ENV
137+
with:
138+
version: "18.1.8"
149139

150-
- name: Configure CBake
140+
- name: Setup CBake
141+
uses: Devolutions/actions-public/setup-cbake@cbake
151142
if: matrix.os == 'linux'
152-
shell: pwsh
153-
run: |
154-
$CBakeVersion = "v2025.02.18.0"
155-
$CBakeRepoUrl = "https://github.com/Devolutions/CBake"
156-
$CBakeDownloadUrl = "$CBakeRepoUrl/releases/download/$CBakeVersion"
157-
git clone -b $CBakeVersion "https://github.com/Devolutions/CBake" cbake
158-
@('ubuntu-20.04-amd64-sysroot.tar.xz', 'ubuntu-20.04-arm64-sysroot.tar.xz') | % {
159-
curl -L --output "cbake/sysroots/$_" "$CBakeDownloadUrl/$_"
160-
tar -C "cbake/sysroots" -xf "cbake/sysroots/$_"
161-
Remove-Item "cbake/sysroots/$_" | Out-Null
162-
}
163-
$CBakeHome = Join-Path (Get-Location) 'cbake'
164-
echo "CBAKE_HOME=$CBakeHome" >> $Env:GITHUB_ENV
165-
sudo apt install ninja-build g++-aarch64-linux-gnu
143+
with:
144+
version: "v2025.02.18.0"
145+
sysroots: |
146+
- ubuntu-20.04-amd64
147+
- ubuntu-20.04-arm64
148+
cargo_env_scripts: true
166149

167150
- name: Build picky (${{matrix.os}}-${{matrix.arch}})
168151
shell: pwsh
@@ -193,15 +176,7 @@ jobs:
193176
194177
if ($DotNetOs -eq 'linux') {
195178
$LinuxArch = @{'x64'='amd64';'arm64'='arm64'}[$DotNetArch]
196-
$CMakeToolchainFile = Join-Path $Env:CBAKE_HOME "cmake/linux.toolchain.cmake"
197179
$Env:SYSROOT_NAME = "ubuntu-20.04-$LinuxArch"
198-
$CMakeSourceDir = "$Env:CBAKE_HOME/cargo"
199-
$CMakeBuildDir = "$Env:CBAKE_HOME/cargo/${Env:SYSROOT_NAME}"
200-
$CMakeArgs = @(
201-
"-DSYSROOT_NAME=$Env:SYSROOT_NAME",
202-
"-DCMAKE_TOOLCHAIN_FILE=$CMakeToolchainFile"
203-
)
204-
cmake $CMakeSourceDir -G Ninja -B $CMakeBuildDir $CMakeArgs
205180
. "$HOME/.cargo/cbake/${RustTarget}-enter.ps1"
206181
}
207182

0 commit comments

Comments
 (0)