Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GHA CI for PRs from external contributors #2486

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −2
Open

Fix GHA CI for PRs from external contributors #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afbaf34
emerge-gitclone: Use commit+FETCH_HEAD for fetching
jepio Nov 28, 2024
95f036d
sdk_lib: Encode full sha into version for dev builds in github actions
jepio Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...er/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ EGIT_REPO_URI="https://github.com/flatcar/flatcar-dev-util.git"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
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"
fi

Expand Down
7 changes: 6 additions & 1 deletion sdk_lib/sdk_container_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ function yell() {
function get_git_version() {
local tag="$(git tag --points-at HEAD)"
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
echo "$tag"
fi
Expand Down
Loading