Skip to content

Commit 5396648

Browse files
jeremyd2019jeremyd2019
authored
Update bootstrap_rust.yml
1 parent 2379e42 commit 5396648

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

‎.github/workflows/bootstrap_rust.yml‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
workflow_dispatch:
66

77
env:
8-
LLVM_VERSION: 20.1.8-2
8+
LLVM_VERSION: 21.1.2-1
9+
RUST_VERSION: 1.90.0
910

1011
jobs:
1112
cross_rust:
@@ -51,6 +52,7 @@ jobs:
5152
libxml2-devel
5253
zlib-devel
5354
libzstd-devel
55+
liblzma-devel
5456
vim
5557
python39-sphinx
5658
python39-pytz
@@ -90,11 +92,11 @@ jobs:
9092
ln bin/gcc.exe bin/${b}.exe
9193
done
9294
#RUST_URL="$(python3 -c "import tomli; from urllib.request import urlopen; x = tomli.load(urlopen('https://static.rust-lang.org/dist/channel-rust-nightly.toml')); a = [y for y in x['artifacts']['source-code']['target']['*'] if y['url'].endswith('.xz')]; print(a[0]['url'])")"
93-
RUST_URL="https://static.rust-lang.org/dist/rustc-1.89.0-src.tar.xz"
95+
RUST_URL="https://static.rust-lang.org/dist/rustc-${{ env.RUST_VERSION }}-src.tar.xz"
9496
echo "$RUST_URL" | tee rust-url.txt
9597
curl -LO "$RUST_URL"
96-
tar -Jxf rustc-1.89.0-src.tar.xz
97-
cd rustc-1.89.0-src
98+
tar -Jxf rustc-${{ env.RUST_VERSION }}-src.tar.xz
99+
cd rustc-${{ env.RUST_VERSION }}-src
98100
MSYS2_ROOT="$(cygpath -m '${{ steps.msys2.outputs.msys2-location }}')" WORKSPACE="$(cygpath -ma "$HOME/bin")" envsubst < ../bootstrap.toml > bootstrap.toml
99101
export PATH="$HOME/bin:$(cygpath -u '${{ steps.msys2.outputs.msys2-location }}')/mingw64/bin:$PATH"
100102
PKG_CONFIG_SYSROOT_DIR="$(cygpath -w /)" \
@@ -104,6 +106,8 @@ jobs:
104106
OPENSSL_LIB_DIR="$(cygpath -w /usr/lib)" \
105107
OPENSSL_STATIC=0 \
106108
LIBSQLITE3_SYS_USE_PKG_CONFIG=1 \
109+
LIBSSH2_SYS_USE_PKG_CONFIG=1 \
110+
ZSTD_SYS_USE_PKG_CONFIG=1 \
107111
DESTDIR="$(cygpath -w "$PWD/build-Cygwin/dest-rust")" \
108112
python x.py install --stage 2
109113
cd build-Cygwin/dest-rust && tar -Jcf ~/rust-prefix.tar.xz *
@@ -114,7 +118,7 @@ jobs:
114118
path: |
115119
${{steps.cygwin.outputs.root}}/home/runneradmin/rust-url.txt
116120
${{steps.cygwin.outputs.root}}/home/runneradmin/rust-prefix.tar.xz
117-
${{steps.cygwin.outputs.root}}/home/runneradmin/rustc-1.89.0-src.tar.xz
121+
${{steps.cygwin.outputs.root}}/home/runneradmin/rustc-${{ env.RUST_VERSION }}-src.tar.xz
118122
119123
- run: DEL /F ${{ steps.cygwin.outputs.root }}\bin\git.exe
120124
if: always()
@@ -165,6 +169,7 @@ jobs:
165169
libxml2-devel
166170
zlib-devel
167171
libzstd-devel
172+
liblzma-devel
168173
vim
169174
python39-sphinx
170175
python39-pytz
@@ -204,11 +209,11 @@ jobs:
204209
ln bin/gcc.exe bin/${b}.exe
205210
done
206211
#RUST_URL="$(python3 -c "import tomli; from urllib.request import urlopen; x = tomli.load(urlopen('https://static.rust-lang.org/dist/channel-rust-nightly.toml')); a = [y for y in x['artifacts']['source-code']['target']['*'] if y['url'].endswith('.xz')]; print(a[0]['url'])")"
207-
RUST_URL="https://static.rust-lang.org/dist/rustc-1.89.0-src.tar.xz"
212+
RUST_URL="https://static.rust-lang.org/dist/rustc-${{ env.RUST_VERSION }}-src.tar.xz"
208213
echo "$RUST_URL" | tee rust-url.txt
209214
curl -LO "$RUST_URL"
210-
tar -Jxf rustc-1.89.0-src.tar.xz || true
211-
cd rustc-1.89.0-src
215+
tar -Jxf rustc-${{ env.RUST_VERSION }}-src.tar.xz || true
216+
cd rustc-${{ env.RUST_VERSION }}-src
212217
MSYS2_ROOT="$(cygpath -m '${{ steps.msys2.outputs.msys2-location }}')" WORKSPACE="$(cygpath -ma "$HOME/bin")" envsubst < ../bootstrap.toml | sed -e 's/gz/xz/' > bootstrap.toml
213218
export PATH="$HOME/bin:$(cygpath -u '${{ steps.msys2.outputs.msys2-location }}')/mingw64/bin:$PATH"
214219
PKG_CONFIG_SYSROOT_DIR="$(cygpath -w /)" \
@@ -218,14 +223,16 @@ jobs:
218223
OPENSSL_LIB_DIR="$(cygpath -w /usr/lib)" \
219224
OPENSSL_STATIC=0 \
220225
LIBSQLITE3_SYS_USE_PKG_CONFIG=1 \
226+
LIBSSH2_SYS_USE_PKG_CONFIG=1 \
227+
ZSTD_SYS_USE_PKG_CONFIG=1 \
221228
DESTDIR="$(cygpath -w "$PWD/build-Cygwin/dest-rust")" \
222229
python x.py dist
223230
shell: d:\cygwin\bin\bash.exe -leo pipefail -o igncr '{0}'
224231
- uses: actions/upload-artifact@v4
225232
with:
226233
name: rust-dist
227234
path: |
228-
${{steps.cygwin.outputs.root}}/home/runneradmin/rustc-1.89.0-src/build-Cygwin/dist/*
235+
${{steps.cygwin.outputs.root}}/home/runneradmin/rustc-${{ env.RUST_VERSION }}-src/build-Cygwin/dist/*
229236
230237
- run: DEL /F ${{ steps.cygwin.outputs.root }}\bin\git.exe
231238
if: always()
@@ -247,7 +254,7 @@ jobs:
247254
env:
248255
GITHUB_TOKEN: ${{ github.token }}
249256
run: |
250-
gh -R '${{ github.repository }}' release create rust-1.89.0-cygwin --target '${{ github.sha }}' --title rust-1.89.0-cygwin --notes "" rust-dist/*
257+
gh -R '${{ github.repository }}' release create rust-${{ env.RUST_VERSION }}-cygwin --target '${{ github.sha }}' --title rust-${{ env.RUST_VERSION }}-cygwin --notes "" rust-dist/*
251258
252259
native_rust:
253260
runs-on: windows-latest
@@ -289,6 +296,7 @@ jobs:
289296
libxml2-devel
290297
zlib-devel
291298
libzstd-devel
299+
liblzma-devel
292300
vim
293301
python39-sphinx
294302
python39-pytz
@@ -323,12 +331,14 @@ jobs:
323331
cp "$GITHUB_WORKSPACE/rust-prefix/rust-url.txt" .
324332
(cd / && tar -Jxvf "$GITHUB_WORKSPACE/rust-prefix/rust-prefix.tar.xz" | grep -E -- '^usr/bin/[^/]+-[0-9a-f]{16}.dll$' | grep -v rustc_driver | xargs rm)
325333
rebase -s /usr/bin/rustc_driver*.dll
326-
tar -Jxf "$GITHUB_WORKSPACE/rust-prefix/rustc-1.89.0-src.tar.xz"
327-
cd rustc-1.89.0-src
334+
tar -Jxf "$GITHUB_WORKSPACE/rust-prefix/rustc-${{ env.RUST_VERSION }}-src.tar.xz"
335+
cd rustc-${{ env.RUST_VERSION }}-src
328336
cp "$GITHUB_WORKSPACE/bootstrap-native.toml" bootstrap.toml
329337
LIBGIT2_NO_VENDOR=1 \
330338
OPENSSL_STATIC=0 \
331339
LIBSQLITE3_SYS_USE_PKG_CONFIG=1 \
340+
LIBSSH2_SYS_USE_PKG_CONFIG=1 \
341+
ZSTD_SYS_USE_PKG_CONFIG=1 \
332342
DESTDIR="$PWD/build-Cygwin/dest-rust" \
333343
python3 x.py install --stage 2
334344
cd build-Cygwin/dest-rust && tar -Jcf ~/rust-prefix.tar.xz *

0 commit comments

Comments
 (0)