Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LINC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
ResearchAndDevelopment
LINC
Commits
727fca3a
Commit
727fca3a
authored
1 year ago
by
alex
Browse files
Options
Downloads
Patches
Plain Diff
Use newer DP3 commit
parent
efd84bf3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!157
Use newer DP3 commit
Pipeline
#51594
passed
1 year ago
Stage: versioning
Stage: build
Stage: tests
Stage: docs
Stage: deploy
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Docker/Dockerfile-base
+1
-1
1 addition, 1 deletion
Docker/Dockerfile-base
with
2 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
727fca3a
...
...
@@ -36,7 +36,7 @@ versioning:
-
git fetch --unshallow
-
./Docker/fetch_latest_commits.sh | tee commits.txt > versions.env
# TODO: pinned version for DP3
-
echo DP3_COMMIT=
b493728441362e
b15e
5ee7dd1bd824c97844d700
>> versions.env
-
echo DP3_COMMIT=
123e194
b1
3
5e
fd5fd471ff5817c7af6d1ae48bb8
>> versions.env
-
echo LINC_VERSION=$(git describe --tags --always) >> versions.env
# Use hash of commits to determine version of base image (and rebuild if necessary)
-
echo INTEGRATION_BASE_IMAGE=${CI_REGISTRY_IMAGE}/integration_base:$(sha256sum commits.txt | cut -d " " -f 1) >> versions.env
...
...
This diff is collapsed.
Click to expand it.
Docker/Dockerfile-base
+
1
−
1
View file @
727fca3a
...
...
@@ -115,7 +115,7 @@ ARG DP3_COMMIT=master
RUN git clone --no-checkout \
https://git.astron.nl/RD/DP3.git && \
mkdir DP3/build && \
cd DP3 && git checkout
b493728441362eb15e5ee7dd1bd824c97844d700
&& \
cd DP3 && git checkout
${DP3_COMMIT}
&& \
cd build && \
cmake .. -DPORTABLE=${PORTABLE} -DLIBDIRAC_PREFIX=/usr/local/ && \
make install -j`nproc`
...
...
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