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

Merge 95f036d9f7 into 5cc0d8c40c

Browse Source
This commit is contained in:
Jeremi Piotrowski 2025-08-04 23:45:19 -07:00 committed by GitHub
commit 8f9ed1ec78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild vendored
View File

@ -7,7 +7,9 @@ EGIT_REPO_URI="https://github.com/flatcar/flatcar-dev-util.git"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master #EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master
EGIT_COMMIT="cd1b814127e8d8dbe8513ba10195eab70c853579" # flatcar-master
EGIT_BRANCH="jepio/fetch-head"
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi

7
sdk_lib/sdk_container_common.sh
View File

@ -55,7 +55,12 @@ function yell() {
function get_git_version() { function get_git_version() {
local tag="$(git tag --points-at HEAD)" local tag="$(git tag --points-at HEAD)"
if [ -z "$tag" ] ; then if [ -z "$tag" ] ; then
git describe --tags local abbrev=
# emerge-gitclone needs the full SHA for external PRs
if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
abbrev="--abbrev=40"
fi
git describe --tags ${abbrev}
else else
echo "$tag" echo "$tag"
fi fi