diff --git a/.changes/1623.json b/.changes/1623.json new file mode 100644 index 000000000..a35610e86 --- /dev/null +++ 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 new file mode 100644 index 000000000..d2d40724c --- /dev/null +++ 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 index bcf81ea36..c251921f5 100644 --- 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 index c32cb78c6..25b769fa7 100644 --- 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 index f754a676b..7d3f498f8 100644 --- 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 index 6e44aca15..0df3b2d50 100644 --- 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 index 5b1c4e2f3..73b92c611 100644 --- 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 index 8991dd8e9..58340b4ae 100644 --- 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 index 3ced523f2..fabfbeecb 100644 --- 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 index ff80e9215..1ad529798 100644 --- 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 index 012dc4dc0..f0483ed7b 100755 --- 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 index 2c4404eb1..17e8e7fef 100755 --- 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 index c3d2ba78e..a65668e17 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -959,6 +959,7 @@ pub fn toml(metadata: &CargoMetadata, msg_info: &mut MessageInfo) -> Result