Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
clarin-dspace
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
commul
docker
clarin-dspace
Commits
dbf32d61
Commit
dbf32d61
authored
5 years ago
by
Alexander König
Browse files
Options
Downloads
Patches
Plain Diff
some bug fixes to DEPLOYMENT guide
parent
0491e95b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
DEPLOYMENT.md
+2
-2
2 additions, 2 deletions
DEPLOYMENT.md
with
2 additions
and
2 deletions
DEPLOYMENT.md
+
2
−
2
View file @
dbf32d61
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
[ ] (Optional) You can now deploy stable to dspace-dev (
`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`
)
-
[ ] (Optional) You can now deploy stable to dspace-dev (
`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`
)
-
[ ] Make sure that the stable branch is clean and all commits are pushed to origin
-
[ ] Make sure that the stable branch is clean and all commits are pushed to origin
-
[ ]
`git checkout production`
-
[ ]
`git checkout production`
-
[ ]
`git checkout -b
v
$VERSION_NUMBER $HASHID
-- .
`
-
[ ]
`git checkout -b $VERSION_NUMBER $HASHID`
The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
-
[ ]
`git merge --no-ff stable`
-
[ ]
`git merge --no-ff stable`
-
[ ] resolve conflicts (though there shouldn't be any) and commit
-
[ ] resolve conflicts (though there shouldn't be any) and commit
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
[ ] Run the clarindev2clarin.sh script
-
[ ] Run the clarindev2clarin.sh script
-
[ ]
`git commit -a `
-
[ ]
`git commit -a `
-
[ ]
`git checkout production`
-
[ ]
`git checkout production`
-
[ ]
`git merge
v1.3-
$VERSION_NUMBER`
-
[ ]
`git merge $VERSION_NUMBER`
-
[ ] resolve conflicts and commit
-
[ ] resolve conflicts and commit
-
[ ]
`git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)`
defaults to your default GPG key
-
[ ]
`git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)`
defaults to your default GPG key
-
[ ]
`git branch -d $VERSION_NUMBER`
-
[ ]
`git branch -d $VERSION_NUMBER`
...
...
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