Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Feliks Kiszkurno
ogs-feliks
Commits
e67b41f2
Unverified
Commit
e67b41f2
authored
11 months ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[ci] Run cpm cache and offline configure jobs in shell runner.
parent
9c53127b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/ci/jobs/ci_images.yml
+0
-8
0 additions, 8 deletions
scripts/ci/jobs/ci_images.yml
scripts/ci/jobs/package.yml
+4
-6
4 additions, 6 deletions
scripts/ci/jobs/package.yml
with
4 additions
and
14 deletions
scripts/ci/jobs/ci_images.yml
+
0
−
8
View file @
e67b41f2
...
...
@@ -30,21 +30,13 @@ ci_images:
dotenv
:
build.env
script
:
-
|
echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env
echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env
echo "WEB_IMAGE=${CONTAINER_REGISTRY}/web:${CONTAINER_TAG}" >> build.env
cat build.env
if [ "${BUILD_CONTAINER}" != true ]; then exit 0; fi
-
source build.env
-
!reference
[
.container-maker-setup
,
before_script
]
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
--pm off --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_PM_OFF_IMAGE --upload
--cpu-target $CPU_TARGET
--packages build-essential jq moreutils
-
cd ${CI_PROJECT_DIR}
-
docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
-
docker push $XUNIT_TO_JUNIT_IMAGE
...
...
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/package.yml
+
4
−
6
View file @
e67b41f2
create cpm cache
:
stage
:
package
tags
:
[
docker
]
needs
:
[
meta
,
ci_images
]
image
:
$CONTAINER_GCC_PM_OFF_IMAGE
tags
:
[
envinf
,
shell
]
needs
:
[
meta
]
rules
:
-
if
:
$CI_COMMIT_TITLE == "[versions] Updated cpm cache info."
when
:
never
...
...
@@ -75,9 +74,8 @@ create cpm cache:
offline configure
:
stage
:
package
tags
:
[
docker
]
needs
:
[
meta
,
ci_images
]
image
:
$CONTAINER_GCC_PM_OFF_IMAGE
tags
:
[
envinf
,
shell
]
needs
:
[
meta
]
rules
:
# For testing: remove rules-directive
-
if
:
'
$CI_COMMIT_BRANCH
==
"master"'
...
...
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