Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding Salome 9.7 to CI #157

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Adding Salome 9.7 to CI #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04ff47c
initial add
philbucher Jul 21, 2021
95aaaba
disable scheduled execution
philbucher Jul 21, 2021
20c53cc
trigger workflow
philbucher Jul 21, 2021
7fa7ec3
againt trying to trigger CI
philbucher Jul 21, 2021
551d0cb
trying universal version of 9.7
philbucher Jul 21, 2021
4a9aad3
install gcc for omp
philbucher Jul 21, 2021
0cebbfb
using libgomp1
philbucher Jul 21, 2021
b3489ce
fixing syntax
philbucher Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/docker_ubuntu_bionic/DockerFile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ RUN apt-get update -y && apt-get -y install --no-install-recommends \
libpng16-16 \
# install libfontconfig for qt
libfontconfig \
libicu60 && \
libicu60 \
libgomp1 && \
rm -rf /var/lib/apt/lists/* && \
# getting salome
wget -nv ${salome_download_path} -O salome_dir.tar.gz && \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check_salome_execution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- '.github/workflows/check_salome_execution.yml'
- '.github/assert_run_in_salome.py'

schedule:
- cron: '0 3 * * TUE' # new docker image is built at 2am every Tuesday, hence running this one hour later
# schedule:
# - cron: '0 3 * * TUE' # new docker image is built at 2am every Tuesday, hence running this one hour later


jobs:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
salome-version: [9-3, 9-4, 9-5, 9-6]
salome-version: [9-3, 9-4, 9-5, 9-6, 9-7]

runs-on: ubuntu-18.04

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches:
- master

schedule:
- cron: '0 3 * * *' # new docker image is built at 2am every Tuesday, hence running this one hour later
# schedule:
# - cron: '0 3 * * *' # new docker image is built at 2am every Tuesday, hence running this one hour later


jobs:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
strategy:
fail-fast: false
matrix:
salome-version: [9-3, 9-4, 9-5, 9-6]
salome-version: [9-3, 9-4, 9-5, 9-6, 9-7]

runs-on: ubuntu-latest

Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/dockerimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ on:
- '.github/docker_ubuntu_bionic/DockerFile'
- '.github/workflows/dockerimage.yml'

schedule:
- cron: '0 2 * * TUE'
# schedule:
# - cron: '0 2 * * TUE'


jobs:

create-docker-ubuntu:
strategy:
fail-fast: false
matrix:
salome-version: [9-3, 9-4, 9-5, 9-6]
salome-version: [9-3, 9-4, 9-5, 9-6, 9-7]

runs-on: ubuntu-18.04

Expand All @@ -34,6 +35,8 @@ jobs:
SALOME_DOWNLOAD_PATH="https://www.salome-platform.org/downloads/current-version/DownloadDistr?platform=SP.UB18.04&version=9.5.0"
elif [ ${{ matrix.salome-version }} == 9-6 ]; then
SALOME_DOWNLOAD_PATH="https://www.salome-platform.org/downloads/current-version/DownloadDistr?platform=SP.UB18.04&version=9.6.0"
elif [ ${{ matrix.salome-version }} == 9-7 ]; then
SALOME_DOWNLOAD_PATH="https://www.salome-platform.org/downloads/current-version/DownloadDistr?platform=SP.UNILIN&version=9.7.0"
else
echo 'No "SALOME_DOWNLOAD_PATH" configured for version ${{ matrix.salome-version }}'
exit 1
Expand All @@ -58,12 +61,13 @@ jobs:
# TODO maybe in the future a better solution can be found for the execution of the tests after the docker is rebuilt
# right now quite some copy paste is necessary


testing-in-salome:
needs: create-docker-ubuntu
strategy:
fail-fast: false
matrix:
salome-version: [9-3, 9-4, 9-5, 9-6]
salome-version: [9-3, 9-4, 9-5, 9-6, 9-7]

runs-on: ubuntu-18.04

Expand Down Expand Up @@ -91,7 +95,7 @@ jobs:
strategy:
fail-fast: false
matrix:
salome-version: [9-3, 9-4, 9-5, 9-6]
salome-version: [9-3, 9-4, 9-5, 9-6, 9-7]

runs-on: ubuntu-18.04

Expand All @@ -104,4 +108,4 @@ jobs:
- name: assert run in salome
run: |
cd .github
python3 ../execute_in_salome.py /root/salome_dir/salome assert_run_in_salome.py 1
python3 ../execute_in_salome.py /root/salome_dir/salome assert_run_in_salome.py 1