Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
86da5a10
Commit
86da5a10
authored
8 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
scripts/mkimage: fix generation of version string
use git tag if we are at a given tag. use timestamp otherwise
parent
ac210c74
No related branches found
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/mkimage-yaml.sh
+0
-6
0 additions, 6 deletions
scripts/mkimage-yaml.sh
scripts/mkimage.sh
+10
-1
10 additions, 1 deletion
scripts/mkimage.sh
with
10 additions
and
7 deletions
scripts/mkimage-yaml.sh
+
0
−
6
View file @
86da5a10
...
...
@@ -34,12 +34,6 @@ fi
[
-n
"
$arch
"
]
||
arch
=
$(
apk
--print-arch
)
if
[
-z
"
$release
"
]
;
then
release
=
$(
git describe
--always
)
if
git describe
--exact-match
>
/dev/null 2>&1
;
then
release
=
${
release
#v
}
fi
fi
for
image
;
do
filepath
=
"
$releasedir
/
${
image
##*/
}
"
...
...
This diff is collapsed.
Click to expand it.
scripts/mkimage.sh
+
10
−
1
View file @
86da5a10
...
...
@@ -29,7 +29,6 @@ _simulate=""
_checksum
=
""
OUTDIR
=
"
$PWD
"
RELEASE
=
"
${
build_date
}
"
msg
()
{
if
[
-n
"
$quiet
"
]
;
then return
0
;
fi
...
...
@@ -208,6 +207,15 @@ while [ $# -gt 0 ]; do
esac
done
if
[
-z
"
$RELEASE
"
]
;
then
if
git describe
--exact-match
>
/dev/null 2>&1
;
then
RELEASE
=
$(
git describe
--always
)
RELEASE
=
${
RELEASE
#v
}
else
RELEASE
=
"
${
build_date
}
"
fi
fi
# setup defaults
if
[
-z
"
$WORKDIR
"
]
;
then
WORKDIR
=
"
$(
mktemp
-d
-t
mkimage.XXXXXX
)
"
...
...
@@ -253,3 +261,4 @@ for ARCH in $req_arch; do
(
build_profile
)
||
exit
1
done
done
echo
"Images generated in
$OUTDIR
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment