From d953100387bb4cd3113502bf3eb1811d668b3022 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 31 Jan 2023 14:58:11 +0100 Subject: [PATCH] Revert ".github: update PV in ebuilds of dev-lang/rust" This reverts commit 285f0646e6dfb3381d2ac5555e991cc482a4d91c. Now that the ebuild dev-lang/rust does not have a manual check for versions, it is possible to clean up the sed commands in Github Actions. --- .../coreos-overlay/.github/workflows/rust-apply-patch.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh index aa2286a2a6..4ca7d33209 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh @@ -28,12 +28,6 @@ find profiles -name 'package.*' | xargs sed -i "s/\([><]*=\|~\)*dev-lang\/rust-\ find profiles -name 'package.*' | xargs sed -i "s/\([><]*=\|~\)*virtual\/rust-\S\+/\1virtual\/rust-${VERSION_NEW}/" EBUILD_FILENAME=$(get_ebuild_filename "dev-lang" "rust" "${VERSION_OLD}") - -# Every ebuild for dev-lang/rust does a specific check if PV is the version. -# e.g. if [[ "${PV}" == 1.66.1 ]]; then, -# So it is needed to replace the hard-coded version with the new version. -sed -i "s/PV\(.*\)${VERSION_OLD}/PV\1${VERSION_NEW}/g" ${EBUILD_FILENAME} - git mv "${EBUILD_FILENAME}" "dev-lang/rust/rust-${VERSION_NEW}.ebuild" EBUILD_FILENAME=$(get_ebuild_filename "virtual" "rust" "${VERSION_OLD}") git mv "${EBUILD_FILENAME}" "virtual/rust/rust-${VERSION_NEW}.ebuild"