From 04ff47cfc135ec68c58bf54ffd269414fa12b8b6 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 11:19:08 +0200 Subject: [PATCH 1/8] initial add --- .github/workflows/check_salome_execution.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/dockerimage.yml | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check_salome_execution.yml b/.github/workflows/check_salome_execution.yml index dbdecc2..8318c9f 100644 --- a/.github/workflows/check_salome_execution.yml +++ b/.github/workflows/check_salome_execution.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 739084a..4e6afbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 44b803f..fc153c7 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,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 @@ -34,6 +34,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.UB18.04&version=9.7.0" else echo 'No "SALOME_DOWNLOAD_PATH" configured for version ${{ matrix.salome-version }}' exit 1 @@ -63,7 +65,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 @@ -91,7 +93,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 From 95aaabaa5e60407b54250055e0e1990ac7caf70b Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 11:23:47 +0200 Subject: [PATCH 2/8] disable scheduled execution not really needed --- .github/workflows/check_salome_execution.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- .github/workflows/dockerimage.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check_salome_execution.yml b/.github/workflows/check_salome_execution.yml index 8318c9f..df1ab62 100644 --- a/.github/workflows/check_salome_execution.yml +++ b/.github/workflows/check_salome_execution.yml @@ -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: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e6afbc..cb63acc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index fc153c7..faada17 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,8 +6,8 @@ on: - '.github/docker_ubuntu_bionic/DockerFile' - '.github/workflows/dockerimage.yml' - schedule: - - cron: '0 2 * * TUE' + # schedule: + # - cron: '0 2 * * TUE' jobs: From 20c53cca7edd7fdf6ef2c0e6f95106641f72f6d7 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 11:28:16 +0200 Subject: [PATCH 3/8] trigger workflow --- .github/workflows/dockerimage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index faada17..874e8d7 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,6 +9,7 @@ on: # schedule: # - cron: '0 2 * * TUE' + jobs: create-docker-ubuntu: From 7fa7ec3c2aea92aec086561afe6bca40146db8ca Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 11:31:26 +0200 Subject: [PATCH 4/8] againt trying to trigger CI --- .github/workflows/dockerimage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 874e8d7..f0ae730 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -61,6 +61,7 @@ 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: @@ -107,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 \ No newline at end of file + python3 ../execute_in_salome.py /root/salome_dir/salome assert_run_in_salome.py 1 From 551d0cbdc8e8438b7ed1fc301dde34feef31c020 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 12:41:42 +0200 Subject: [PATCH 5/8] trying universal version of 9.7 --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f0ae730..54b93fb 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -36,7 +36,7 @@ jobs: 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.UB18.04&version=9.7.0" + 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 From 4a9aad393eb5ae027bba2d286d7619b9e468d0e7 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 16:05:55 +0200 Subject: [PATCH 6/8] install gcc for omp --- .github/docker_ubuntu_bionic/DockerFile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/docker_ubuntu_bionic/DockerFile b/.github/docker_ubuntu_bionic/DockerFile index a6b0bde..1fd9dec 100644 --- a/.github/docker_ubuntu_bionic/DockerFile +++ b/.github/docker_ubuntu_bionic/DockerFile @@ -22,6 +22,7 @@ RUN apt-get update -y && apt-get -y install --no-install-recommends \ # install libfontconfig for qt libfontconfig \ libicu60 && \ + gcc && \ rm -rf /var/lib/apt/lists/* && \ # getting salome wget -nv ${salome_download_path} -O salome_dir.tar.gz && \ From 0cebbfb995f6e219e76dfe8913b691e34b2280c4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 16:09:11 +0200 Subject: [PATCH 7/8] using libgomp1 --- .github/docker_ubuntu_bionic/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker_ubuntu_bionic/DockerFile b/.github/docker_ubuntu_bionic/DockerFile index 1fd9dec..02f2ae2 100644 --- a/.github/docker_ubuntu_bionic/DockerFile +++ b/.github/docker_ubuntu_bionic/DockerFile @@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get -y install --no-install-recommends \ # install libfontconfig for qt libfontconfig \ libicu60 && \ - gcc && \ + libgomp1 && \ rm -rf /var/lib/apt/lists/* && \ # getting salome wget -nv ${salome_download_path} -O salome_dir.tar.gz && \ From b3489cef982a7f09e8541d36310d5a7064e3369f Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 21 Jul 2021 16:12:02 +0200 Subject: [PATCH 8/8] fixing syntax --- .github/docker_ubuntu_bionic/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker_ubuntu_bionic/DockerFile b/.github/docker_ubuntu_bionic/DockerFile index 02f2ae2..350bec8 100644 --- a/.github/docker_ubuntu_bionic/DockerFile +++ b/.github/docker_ubuntu_bionic/DockerFile @@ -21,7 +21,7 @@ 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