Merge branch 'main' into more-arm64-docker-builds

cross-rs · Feb 19, 2025 · ae035b9 · ae035b9
2 parents 84164e1 + c7dee4d
commit ae035b9
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 9 deletions.
diff --git a/.changes/1623.json b/.changes/1623.json
@@ -0,0 +1,4 @@
+{
+    "type": "fixed",
+    "description": "fixed an issue where cross would look for metadata.cross outside the workspace"
+  }
diff --git a/.changes/1625.json b/.changes/1625.json
@@ -0,0 +1,4 @@
+{
+    "description": "bump ct-ng to 1.27.0",
+    "type": "changed"
+}
diff --git a/.github/actions/cargo-install-upload-artifacts/action.yml b/.github/actions/cargo-install-upload-artifacts/action.yml
@@ -77,7 +77,7 @@ runs:
 
     - name: Upload artifacts
       if: ${{ steps.archive.outputs.path }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.archive.outputs.name }}
         path: ${{ steps.archive.outputs.path }}

diff --git a/.github/actions/cargo-publish/action.yml b/.github/actions/cargo-publish/action.yml
@@ -21,7 +21,7 @@ runs:
 
     - name: Download artifacts
       id: download-artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path:
           ${{ runner.temp }}/artifacts

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -423,7 +423,7 @@ jobs:
         with:
           ref: ${{ inputs.checkout-ref }}
       - uses: ./.github/actions/setup-rust
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: ${{ runner.temp }}/artifacts
       - name: Grab PR number

diff --git a/deny.toml b/deny.toml
@@ -9,9 +9,9 @@ targets = [
 
 [advisories]
 version = 2
-# FIXME: remove this if/when clap changes to is-terminal, atty is
-# patched, or we migrated to an MSRV of 1.66.0.
 ignore = [
+    # FIXME: remove this if/when clap changes to is-terminal, atty is
+    # patched, or we migrated to an MSRV of 1.66.0.
     "RUSTSEC-2021-0145",
     "RUSTSEC-2024-0375"
 ]

diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos
@@ -6,6 +6,12 @@ RUN /linux-image.sh aarch64
 
 FROM centos:7
 
+# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12
+# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
+RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
+  -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
+RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
+
 COPY common.sh lib.sh /
 RUN /common.sh
 

diff --git a/docker/Dockerfile.loongarch64-unknown-linux-gnu b/docker/Dockerfile.loongarch64-unknown-linux-gnu
@@ -15,7 +15,7 @@ FROM cross-base as build
 ARG VERBOSE
 COPY crosstool-ng.sh /
 COPY crosstool-config/loongarch64-unknown-linux-gnu.config /
-RUN /crosstool-ng.sh loongarch64-unknown-linux-gnu.config 5 ed12fa68402f58e171a6f79500f73f4781fdc9e5
+RUN /crosstool-ng.sh loongarch64-unknown-linux-gnu.config 5
 
 ENV PATH /x-tools/loongarch64-unknown-linux-gnu/bin/:$PATH
 

diff --git a/docker/Dockerfile.loongarch64-unknown-linux-musl b/docker/Dockerfile.loongarch64-unknown-linux-musl
@@ -15,7 +15,7 @@ FROM cross-base as build
 ARG VERBOSE
 COPY crosstool-ng.sh /
 COPY crosstool-config/loongarch64-unknown-linux-musl.config /
-RUN /crosstool-ng.sh loongarch64-unknown-linux-musl.config 5 ed12fa68402f58e171a6f79500f73f4781fdc9e5
+RUN /crosstool-ng.sh loongarch64-unknown-linux-musl.config 5
 
 ENV PATH /x-tools/loongarch64-unknown-linux-musl/bin/:$PATH
 

diff --git a/docker/Dockerfile.native.centos b/docker/Dockerfile.native.centos
@@ -11,6 +11,13 @@ RUN /native-linux-image.sh
 
 FROM centos:7
 
+# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12
+# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
+RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
+  -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
+RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
+
+
 COPY common.sh lib.sh /
 RUN /common.sh
 

diff --git a/docker/crosstool-ng.sh b/docker/crosstool-ng.sh
@@ -17,7 +17,7 @@ silence_stdout() {
 main() {
     local config="${1}"
     local nproc="${2}"
-    local ctng_version=${3:-crosstool-ng-1.26.0}
+    local ctng_version=${3:-crosstool-ng-1.27.0}
     local ctng_url="https://github.com/crosstool-ng/crosstool-ng"
     local username=crosstool
     local crosstooldir=/opt/crosstool

diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -57,7 +57,7 @@ max_kernel_version() {
 main() {
     # arch in the rust target
     local arch="${1}" \
-        kversion=5.10.0-27
+        kversion=5.10.0-33
 
     local debsource="deb http://http.debian.net/debian/ bullseye main"
     debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"

diff --git a/src/lib.rs b/src/lib.rs
@@ -959,6 +959,7 @@ pub fn toml(metadata: &CargoMetadata, msg_info: &mut MessageInfo) -> Result<Cros
     for (package, package_metadata) in metadata
         .packages
         .iter()
+        .filter(|p| metadata.workspace_members.contains(&p.id))
         .filter_map(|p| Some((p.manifest_path.as_path(), p.metadata.as_deref()?)))
     {
         let package_metadata =