Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon site
Commits
4a118787
Commit
4a118787
authored
3 months ago
by
Nico
Browse files
Options
Downloads
Patches
Plain Diff
bump gluon to v2023.2.5
parent
6601418a
No related branches found
No related tags found
No related merge requests found
Pipeline
#3729
passed
3 months ago
Stage: generate_date
Stage: update
Stage: build
Stage: package
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
gluon
+1
-1
1 addition, 1 deletion
gluon
scripts/update-gluon.sh
+6
-0
6 additions, 0 deletions
scripts/update-gluon.sh
with
7 additions
and
1 deletion
gluon
@
4863680b
Compare
5e46753a
to
4863680b
Subproject commit
5e46753ad7564b3c2acea30de1b69e4a801a92c4
Subproject commit
4863680b371fa8a5ce6e9bfc6fba23dbb4d93c0b
This diff is collapsed.
Click to expand it.
scripts/update-gluon.sh
+
6
−
0
View file @
4a118787
...
@@ -27,12 +27,18 @@ verify_remotes() {
...
@@ -27,12 +27,18 @@ verify_remotes() {
verify_remotes
verify_remotes
git
-C
"
$gluon_path
"
fetch origin
--tags
git
-C
"
$gluon_path
"
fetch origin
--tags
git
-C
"
$gluon_path
"
fetch upstream
--tags
git
-C
"
$gluon_path
"
fetch upstream
"
$tag_to_update_to
"
git
-C
"
$gluon_path
"
fetch upstream
"
$tag_to_update_to
"
current_tag_name
=
$(
git
-C
"
$gluon_path
"
describe
)
current_tag_name
=
$(
git
-C
"
$gluon_path
"
describe
)
current_upstream_tag_name
=
${
current_tag_name
/-ffs*/
}
current_upstream_tag_name
=
${
current_tag_name
/-ffs*/
}
echo
Detected current tag:
$current_tag_name
echo
Detected upstream tag:
$current_upstream_tag_name
echo
Looks OK?
read
git
-C
"
$gluon_path
"
checkout
-b
"
$tag_to_update_to
-ffs"
git
-C
"
$gluon_path
"
checkout
-b
"
$tag_to_update_to
-ffs"
git
-C
"
$gluon_path
"
rebase
-i
"
$current_upstream_tag_name
"
--onto
FETCH_HEAD
git
-C
"
$gluon_path
"
rebase
-i
"
$current_upstream_tag_name
"
--onto
FETCH_HEAD
...
...
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
sign in
to comment