diff --git a/.github/docker_ubuntu_bionic/DockerFile b/.github/docker_ubuntu_bionic/DockerFile index a6b0bde..350bec8 100644 --- a/.github/docker_ubuntu_bionic/DockerFile +++ b/.github/docker_ubuntu_bionic/DockerFile @@ -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 && \ diff --git a/.github/workflows/check_salome_execution.yml b/.github/workflows/check_salome_execution.yml index dbdecc2..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: @@ -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..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: @@ -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..54b93fb 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,8 +6,9 @@ on: - '.github/docker_ubuntu_bionic/DockerFile' - '.github/workflows/dockerimage.yml' - schedule: - - cron: '0 2 * * TUE' + # schedule: + # - cron: '0 2 * * TUE' + jobs: @@ -15,7 +16,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 +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 @@ -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 @@ -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 @@ -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 \ No newline at end of file + python3 ../execute_in_salome.py /root/salome_dir/salome assert_run_in_salome.py 1