Skip to content

Commit 927faa8

Browse files
committed
chore: Update dependencies, fixups and components
* Update dependency versions, locking 'zip' to "=2.4.2" as a temporary solution * Update fixups for 'bzip2-sys' and 'lzma-sys' * Update NativeLink worker to v0.6.0 * Update Jenkins and Jenkins Agent base image Signed-off-by: Yuxuan Dai <[email protected]>
1 parent ce8c0a2 commit 927faa8

File tree

14 files changed

+1025
-501
lines changed

14 files changed

+1025
-501
lines changed

Diff for: .buckconfig

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
toolchains = toolchains
55
none = none
66

7+
[external_cells]
8+
prelude = bundled
9+
710
[cell_aliases]
811
config = prelude
912
ovr_config = prelude

Diff for: .devcontainer/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM almalinux:8.10-20240923
1+
FROM almalinux:8.10-20250307
22

33
# Install tools and dependencies
44
# Reindeer: openssl-devel
@@ -28,13 +28,13 @@ RUN useradd -m -s /bin/bash -u $USER_UID $USERNAME \
2828
&& usermod -aG docker $USERNAME
2929
USER $USERNAME
3030

31-
# Install Rust with nightly-2024-10-13 toolchain (required by Buck2)
32-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2024-10-13 -y
31+
# Install Rust with nightly-2024-11-22 toolchain (required by Buck2)
32+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2024-11-22 -y
3333
ENV PATH="/home/$USERNAME/.cargo/bin:$PATH"
3434

3535
# Install Buck2 and Reindeer
36-
RUN cargo install --git https://github.com/facebook/buck2.git --rev 7dd41c5a buck2
37-
RUN cargo install --git https://github.com/facebookincubator/reindeer.git --rev ebd86555 reindeer
36+
RUN cargo install --git https://github.com/yxdai-nju/buck2.git --rev 4813980 buck2
37+
RUN cargo install --git https://github.com/facebookincubator/reindeer.git --rev a81ef2c reindeer
3838

3939
# Create and set permissions for workspace directory
4040
USER root

Diff for: .devcontainer/devcontainer.json

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"customizations": {
2323
"vscode": {
2424
"extensions": [
25+
"fill-labs.dependi",
2526
"mrmlnc.vscode-json5",
2627
"ms-azuretools.vscode-docker",
2728
"tamasfe.even-better-toml"

Diff for: .gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@
77
[submodule "sensleak-rs"]
88
path = project/sensleak-rs
99
url = https://github.com/crates-pro/sensleak-rs
10-
[submodule "prelude"]
11-
path = prelude
12-
url = https://github.com/facebook/buck2-prelude

Diff for: deploy/kubernetes/jenkins/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
serviceAccountName: jenkins-admin
3232
containers:
3333
- name: jenkins
34-
image: jenkins/jenkins:2.497-jdk17
34+
image: jenkins/jenkins:2.502-jdk17
3535
env:
3636
- name: JAVA_OPTS
3737
value: "-Duser.timezone=Asia/Shanghai -Dhudson.security.csrf.GlobalCrumbIssuerConfiguration.DISABLE_CSRF_PROTECTION=true"

Diff for: deploy/kubernetes/jenkins/inbound-agent-kubectl.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jenkins/inbound-agent:3283.v92c105e0f819-6-jdk17
1+
FROM jenkins/inbound-agent:3299.v0d0d06908537-1-jdk17
22

33
USER root
44

Diff for: prelude

-1
This file was deleted.

Diff for: remote_execution/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM tugraph/tugraph-compile-centos8:1.3.4
1+
FROM tugraph/tugraph-compile-centos8:1.3.5
22

3-
# Install Rust with nightly-2024-11-23 toolchain (as in NativeLink `MODULE.bazel`)
4-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2024-11-23 -y
3+
# Install Rust with nightly-2025-01-15 toolchain (as in NativeLink `MODULE.bazel`)
4+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2025-01-15 -y
55
ENV PATH="/root/.cargo/bin:$PATH"
66

77
# Install NativeLink
8-
RUN cargo install --git https://github.com/TraceMachina/nativelink.git --rev 7afe2868 nativelink
8+
RUN cargo install --git https://github.com/TraceMachina/nativelink.git --rev 07bd27a nativelink
99

1010
# Install build dependencies
1111
# General: clang, lld, libssh2-devel (requires epel-release)

0 commit comments

Comments
 (0)