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
00113723
Commit
00113723
authored
1 year ago
by
Lars Bilke
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-ci' into 'master'
[ci] Fixes See merge request
ogs/ogs!4845
parents
c572df7e
c2e994a8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitattributes
+0
-4
0 additions, 4 deletions
.gitattributes
scripts/ci/jobs/package.yml
+3
-1
3 additions, 1 deletion
scripts/ci/jobs/package.yml
web/data/versions.json
+1
-1
1 addition, 1 deletion
web/data/versions.json
with
4 additions
and
6 deletions
.gitattributes
+
0
−
4
View file @
00113723
...
@@ -8,7 +8,3 @@
...
@@ -8,7 +8,3 @@
*.h hooks.style=uncrustify
*.h hooks.style=uncrustify
*.cpp hooks.style=uncrustify
*.cpp hooks.style=uncrustify
*.hpp hooks.style=uncrustify
*.hpp hooks.style=uncrustify
# git archive ignores
Tests/Data export-ignore
web/content export-ignore
This diff is collapsed.
Click to expand it.
scripts/ci/jobs/package.yml
+
3
−
1
View file @
00113723
...
@@ -62,6 +62,7 @@ create cpm cache:
...
@@ -62,6 +62,7 @@ create cpm cache:
-
cd ext
-
cd ext
-
wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip
-
wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip
-
wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip
-
wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip
-
wget --no-verbose --output-document f2cblaslapack-3.4.2.q4.tar.gz http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz
-
wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip
-
wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip
-
wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip
-
wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip
-
wget --no-verbose --output-document vtk-v${VTK_VERSION}.zip https://github.com/Kitware/VTK/archive/refs/tags/v${VTK_VERSION}.zip
-
wget --no-verbose --output-document vtk-v${VTK_VERSION}.zip https://github.com/Kitware/VTK/archive/refs/tags/v${VTK_VERSION}.zip
...
@@ -102,4 +103,5 @@ offline configure:
...
@@ -102,4 +103,5 @@ offline configure:
rm CMakeCache.txt
rm CMakeCache.txt
cmake ../../ogs -B . -G Ninja --preset release-petsc \
cmake ../../ogs -B . -G Ninja --preset release-petsc \
-DOGS_DOWNLOAD_CPM_CACHE=ON \
-DOGS_DOWNLOAD_CPM_CACHE=ON \
-DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext
-DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext \
-DOGS_PETSC_CONFIG_OPTIONS="--download-f2cblaslapack=$PWD/ext/f2cblaslapack-3.4.2.q4.tar.gz"
This diff is collapsed.
Click to expand it.
web/data/versions.json
+
1
−
1
View file @
00113723
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
"package_file_sha256"
:
"fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd"
"package_file_sha256"
:
"fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd"
},
},
"ext"
:
{
"ext"
:
{
"cache_hash"
:
"
4ebd62e0ce484732dbf3cd9932f60b67762e156b
"
"cache_hash"
:
"
8621cb642359944025c34dc50eafc8ee8155c710
"
},
},
"libraries"
:
{
"libraries"
:
{
"vtk"
:
{
"vtk"
:
{
...
...
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