-
v1.0-beta4-14-gd64f165_2024-07-10T12-53-06UTCd64f165a · ·
Container image tag "v1.0-beta4-14-gd64f165_2024-07-10T12-53-06UTC"
-
v1.0-beta3-33-g38db6d3_2024-05-22T15-51-39UTC38db6d3d · ·
Tag v1.0-beta3-33-g38db6d3_2024-05-22T15-51-39UTC This was derived from the `develop` branch when the HEAD of the `develop` branch was commit ID 9120e3d11f94c059af1875838157c41544c632df. The following commands were executed: ```bash # Note: The following commands assume that the git remote "origin" is the Gitlab server from which changes should pulled and to which changes should be pushed. git checkout develop git pull # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/307 but prepended with "origin/" git rebase HEAD origin/feature/322_allow_hidden_files # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/308 but prepended with "origin/" git rebase HEAD origin/feature/change_workflow_text # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/309 but prepended with "origin/" git rebase HEAD origin/bug_fix/365-fixes-for-facet-fields # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/310 but prepended with "origin/" git rebase HEAD origin/bug_fix/301_no_method_error # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/311 but prepended with "origin/" git rebase HEAD origin/bug_fix/393-download-for-small-experiments-not-working # Rebasing the branch from merge request 311 causes a merge conflict on file "hyrax/app/assets/stylesheets/rdms.scss", which we have to manually fix vim hyrax/app/assets/stylesheets/rdms.scss git add hyrax/app/assets/stylesheets/ git rebase --continue # Branch name copied from https://gitlab.ruhr-uni-bochum.de/researchdata/rdms/-/merge_requests/313 but prepended with "origin/" git rebase HEAD origin/feature/rerun_import_helper_2 # Create a new branch "test/2024-05-22_3" from the current state git branch test/2024-05-22_3 # Check the results *BEFORE* pushing them to the Gitlab server. You should see the following in the ouput of "git log": # - the HEAD of both the "develop" and "origin/develop" branch (when scrolling down a bit) # - a few lines above the HEAD of the "develop" and "origin/develop" branch, you might possibly see the HEAD of the origin/feature/322_allow_hidden_files "origin/feature/322_allow_hidden_files" branch (the first branch that we rebased upon the develop branch). # Note: You will only see this if no new changes have been pushed to the "develop" or "origin/develop" branch after the "feature/322_allow_hidden_files" branch has been branched/derived from the of the "develop" branch. # - the HEAD of the "test/2024-05-22_3" should be at the very top of "git log" output. git log # If (and only if!) the results are as expected, push the new branch "test/2024-05-22_3" onto the Gitlab server, where that branch does not exist yet. git push origin HEAD:refs/heads/test/2024-05-22_3 ``` Then, after fresh container images were built from this new `test/2024-05-22_3` branch, the HEAD of the branch was assigned a git tag `v1.0-beta3-33-g38db6d3_2024-05-22T15-51-39UTC`, with the name of the git tag being derived from the container image version string generated during the build process of the new container images: ```bash git tag v1.0-beta3-33-g38db6d3_2024-05-22T15-51-39UTC git push --tags ```
-
v1.0-beta3-10-g353506d_2024-04-23T09-43-10UTC353506d5 · ·
Docker image tag "v1.0-beta3-10-g353506d_2024-04-23T09-43-10UTC"
-
v1.0-beta3-9-ge461daa_2024-04-22T14-15-33UTCe461daa7 · ·
Docker image tag "v1.0-beta3-9-ge461daa_2024-04-22T14-15-33UTC"
-
v1.0-beta3-3-ge6f08da_2024-04-16T11-30-54UTCe6f08dab · ·
Docker image tag "v1.0-beta3-3-ge6f08da_2024-04-16T11-30-54UTC"