Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Ci Files
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
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
digicon-webxr-store
Ci Files
Commits
14460732
Commit
14460732
authored
3 years ago
by
julenalbi
Browse files
Options
Downloads
Patches
Plain Diff
merge use theirs
parent
4c68c432
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
stack-updater/stack_updater.yml
+1
-1
1 addition, 1 deletion
stack-updater/stack_updater.yml
with
1 addition
and
1 deletion
stack-updater/stack_updater.yml
+
1
−
1
View file @
14460732
...
@@ -23,7 +23,7 @@ update:
...
@@ -23,7 +23,7 @@ update:
-
git checkout ${branch}
-
git checkout ${branch}
-
git pull
-
git pull
-
git branch --set-upstream-to=origin/${branch} ${branch}
-
git branch --set-upstream-to=origin/${branch} ${branch}
-
git merge -
s ou
rs $current_version
-
git merge -
X thei
rs $current_version
-
git remote rm origin && git remote add origin "https://${access_token_name}:${access_token}@git.code.tecnalia.com/${CI_PROJECT_PATH}.git"
-
git remote rm origin && git remote add origin "https://${access_token_name}:${access_token}@git.code.tecnalia.com/${CI_PROJECT_PATH}.git"
-
git push --follow-tags --set-upstream origin ${branch}
-
git push --follow-tags --set-upstream origin ${branch}
-
node package-version-updater/updateGitlabSide.js --cV $current_version --nV $next_version -p $CI_PROJECT_ID -t $access_token
-
node package-version-updater/updateGitlabSide.js --cV $current_version --nV $next_version -p $CI_PROJECT_ID -t $access_token
...
...
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