mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 21:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

.github: split out from rust into common.sh

Browse Source 
To avoid duplicates, make rust-apply-patch.sh use the helper functions
in `common.sh`.
This commit is contained in:
Dongsu Park 2020-04-09 13:06:02 +02:00 committed by Kai Lüke
parent a292bdd1be
commit 9575d9251c
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh vendored
View File

@ -2,13 +2,11 @@
set -euo pipefail set -euo pipefail
branch="rust-${VERSION_NEW}" . .github/workflows/common.sh
git -C ~/flatcar-sdk/src/scripts checkout -B "${BASE_BRANCH}" "github/${BASE_BRANCH}" checkout_branches "rust-${VERSION_NEW}"
git -C ~/flatcar-sdk/src/third_party/portage-stable checkout -B "${BASE_BRANCH}" "github/${BASE_BRANCH}"
pushd ~/flatcar-sdk/src/third_party/coreos-overlay >/dev/null || exit pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
git checkout -B "${branch}" "github/${BASE_BRANCH}"
updateNeeded=1 updateNeeded=1
VERSION_OLD=$(sed -n "s/^DIST rustc-\(1.[0-9]*.[0-9]*\).*/\1/p" dev-lang/rust/Manifest | sort -ruV | head -n1) VERSION_OLD=$(sed -n "s/^DIST rustc-\(1.[0-9]*.[0-9]*\).*/\1/p" dev-lang/rust/Manifest | sort -ruV | head -n1)
@ -18,28 +16,11 @@ pushd "dev-lang/rust" >/dev/null || exit
git mv $(ls -1 rust-${VERSION_OLD}*.ebuild | sort -ruV | head -n1) "rust-${VERSION_NEW}.ebuild" git mv $(ls -1 rust-${VERSION_OLD}*.ebuild | sort -ruV | head -n1) "rust-${VERSION_NEW}.ebuild"
popd >/dev/null || exit popd >/dev/null || exit
function enter() ( cd ../../.. ; exec cork enter -- "$@" ) popd >/dev/null || exit
enter ebuild "/mnt/host/source/src/third_party/coreos-overlay/dev-lang/rust/rust-${VERSION_NEW}.ebuild" manifest --force generate_patches dev-lang rust Rust
# We can only create the actual commit in the actual source directory, not under the SDK. apply_patches
# So create a format-patch, and apply to the actual source.
git add dev-lang/rust/{rust-${VERSION_NEW},Manifest}*
git commit -a -m "dev-lang/rust: Upgrade Rust ${VERSION_OLD} to ${VERSION_NEW}"
# Generate metadata after the main commit was done.
enter /mnt/host/source/src/scripts/update_metadata --commit coreos
# Create 2 patches, one for the main ebuilds, the other for metadata changes.
git format-patch -2 HEAD
popd || exit
git config user.name 'Flatcar Buildbot'
git config user.email 'buildbot@flatcar-linux.org'
git reset --hard HEAD
git fetch origin
git checkout -B "${BASE_BRANCH}" "origin/${BASE_BRANCH}"
git am ~/flatcar-sdk/src/third_party/coreos-overlay/0*.patch
echo ::set-output name=VERSION_OLD::"${VERSION_OLD}" echo ::set-output name=VERSION_OLD::"${VERSION_OLD}"
echo ::set-output name=UPDATE_NEEDED::"${updateNeeded}" echo ::set-output name=UPDATE_NEEDED::"${updateNeeded}"