diff --git a/.github/scripts/Dockerfile.in b/.github/scripts/Dockerfile.in index e46f85d..f973d9a 100644 --- a/.github/scripts/Dockerfile.in +++ b/.github/scripts/Dockerfile.in @@ -12,6 +12,9 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 ENV OMPI_ALLOW_RUN_AS_ROOT=1 ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 +RUN /root/scripts/use_openmpi.sh +RUN /root/scripts/use_@COMPILER_NAME@@COMPILER_VERSION_WITH_DASH@.sh + RUN cd /tmp \ && git clone --recurse-submodules https://github.com/arcaneframework/framework \ && mkdir build \ @@ -22,7 +25,7 @@ RUN cd /tmp \ -D BUILD_SHARED_LIBS=ON \ -D CMAKE_C_COMPILER=@C_COMPILER@ \ -D CMAKE_CXX_COMPILER=@CXX_COMPILER@ \ - -D ARCCORE_CXX_STANDARD=23 \ + -D ARCCORE_CXX_STANDARD=20 \ -D ARCANE_DEFAULT_PARTITIONER=Metis \ -D CMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ \ -D ARCCORE_BUILD_MODE=@ARCCORE_BUILD_MODE@ \ @@ -30,7 +33,3 @@ RUN cd /tmp \ @CMAKE_CONFIG@ \ && cmake --build /tmp/build --target install \ && cd / && rm -rf /tmp/* - -# RUN useradd -ms /bin/bash arcane_user -# USER arcane_user -# WORKDIR /home/arcane_user diff --git a/.github/workflows/image_creator.yml b/.github/workflows/image_creator.yml index 4dd4e3f..704467c 100644 --- a/.github/workflows/image_creator.yml +++ b/.github/workflows/image_creator.yml @@ -7,20 +7,23 @@ on: os_base: description: 'OS base' required: true - default: 'ubuntu-2204' + default: 'ubuntu-2404' type: choice options: + - 'ubuntu-2404' - 'ubuntu-2204' - 'ubuntu-2004' compiler: description: 'Compiler' required: true - default: 'gcc-12' + default: 'gcc-14' type: choice options: + - 'gcc-14' - 'gcc-12' - 'gcc-11' + - 'clang-18' - 'clang-15' - 'clang-14' - 'clang-13' @@ -70,7 +73,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate Dockerfile shell: 'bash' @@ -84,7 +87,7 @@ jobs: --dockerfile_out ${{ env.DOCKERFILE_OUT }} - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 if: ${{ ! inputs.dockerfile_only }} with: registry: ${{ env.REGISTRY }} @@ -93,7 +96,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 if: ${{ ! inputs.dockerfile_only }} with: images: ${{ env.REGISTRY }}/${{ env.USER_NAME }}/arcane_${{ inputs.os_base }} @@ -106,7 +109,7 @@ jobs: type=raw, ${{ inputs.compiler }}_${{ inputs.dependencies }}_${{ inputs.build_type }}_{{date 'YYYYMMDD'}} - name: Build and push Docker image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 if: ${{ ! inputs.dockerfile_only }} with: context: . @@ -120,7 +123,7 @@ jobs: run: echo "::error::Base image unknown, see available images here https://github.com/arcaneframework/framework-ci#images-disponibles" - name: Upload Dockerfile generated - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: arcane_${{ inputs.os_base }}_${{ inputs.compiler }}_${{ inputs.dependencies }}_${{ inputs.build_type }}_dockerfile path: ${{ env.DOCKERFILE_OUT }} diff --git a/.github/workflows/weekly_images_creator.yml b/.github/workflows/weekly_images_creator.yml index 9a28b10..29c9b8c 100644 --- a/.github/workflows/weekly_images_creator.yml +++ b/.github/workflows/weekly_images_creator.yml @@ -18,14 +18,14 @@ jobs: strategy: fail-fast: false matrix: - os_base: ['ubuntu-2204'] - compiler: ['gcc-12'] + os_base: ['ubuntu-2404'] + compiler: ['gcc-14'] dependencies: ['full', 'minimal'] build_type: ['release', 'debug', 'check'] exclude: - - os_base: 'ubuntu-2204' - compiler: 'gcc-12' + - os_base: 'ubuntu-2404' + compiler: 'gcc-14' dependencies: 'minimal' build_type: 'check' @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate Dockerfile shell: 'bash' @@ -51,7 +51,7 @@ jobs: --dockerfile_out ${{ env.DOCKERFILE_OUT }} - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -59,7 +59,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.USER_NAME }}/arcane_${{ matrix.os_base }} labels: | @@ -71,7 +71,7 @@ jobs: type=raw, ${{ matrix.compiler }}_${{ matrix.dependencies }}_${{ matrix.build_type }}_{{date 'YYYYMMDD'}} - name: Build and push Docker image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . file: ${{ env.DOCKERFILE_OUT }} @@ -84,7 +84,7 @@ jobs: run: echo "::error::Base image unknown, see available images here https://github.com/arcaneframework/framework-ci#images-disponibles" - name: Upload Dockerfile generated - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: arcane_${{ matrix.os_base }}_${{ matrix.compiler }}_${{ matrix.dependencies }}_${{ matrix.build_type }}_dockerfile path: ${{ env.DOCKERFILE_OUT }} diff --git a/README.md b/README.md index 668df9d..5bf43da 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,8 @@ tag with a creation date). Here are the automatically regenerated images (you can change `latest` by a date, see [here](https://github.com/orgs/arcaneframework/packages?repo_name=framework-ci)) : -- `arcane_ubuntu-2204:` - - `gcc-12` +- `arcane_ubuntu-2404:` + - `gcc-14` - `_full_release_latest` - `_full_check_latest` - `_full_debug_latest` @@ -99,7 +99,7 @@ by a date, see [here](https://github.com/orgs/arcaneframework/packages?repo_name - `_minimal_debug_latest` Example : -- `arcane_ubuntu-2204:gcc-12_full_release_latest` +- `arcane_ubuntu-2404:gcc-14_full_release_latest` These images are generated by the "Weekly Images Creator" workflow.