From d497d9ca8b0984dda07b2f4f81f46c89adc7ec20 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 6 Dec 2024 14:30:26 +0100 Subject: [PATCH 1/2] Use ubuntu 24 for ci --- .github/workflows/branchNameValidation.yml | 2 +- .github/workflows/centos7.yml | 8 ++++---- .github/workflows/docker.yml | 2 +- .github/workflows/oracle8.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/branchNameValidation.yml b/.github/workflows/branchNameValidation.yml index 6249133c10..5c5a412b1c 100644 --- a/.github/workflows/branchNameValidation.yml +++ b/.github/workflows/branchNameValidation.yml @@ -5,7 +5,7 @@ on: jobs: valid-branch-name: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 61ac1ec3dd..08aad7af3d 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -30,7 +30,7 @@ jobs: build: name: Build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: @@ -56,7 +56,7 @@ jobs: uses: tj-actions/changed-files@v45 with: files: | - docker/AntaresDeps + docker/AntaresDeps - name: Docker file push id: docker_push @@ -103,13 +103,13 @@ jobs: --build-arg="VCPKG_CACHE_DIR=./vcpkg_cache" \ --build-arg CCACHE_DIR=./.ccache \ --build-arg CCACHE_KEY=centos7-on-${{ runner.os }} \ - -f ${{ env.DOCKERFILE }} . + -f ${{ env.DOCKERFILE }} . - name: create a container without starting it && retrieve the .tgz run: | container_id=$(docker create antares:centos7) - docker cp $container_id:/workspace/Antares_Simulator/_build/archive archive + docker cp $container_id:/workspace/Antares_Simulator/_build/archive archive docker cp $container_id:/workspace/vcpkg_cache ${{ env.VCPKG_CACHE_DIR }} docker cp $container_id:/workspace/.ccache/. .ccache ls -la .ccache diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2ef3c4b3bb..a20b346457 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,7 +8,7 @@ on: jobs: docker_publish: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index e026b4246a..cacb05c48a 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -32,7 +32,7 @@ jobs: env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: 'oraclelinux:8' steps: From ba85316b9ac92ee40fbf308a58a981998c79ef74 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Fri, 6 Dec 2024 14:31:26 +0100 Subject: [PATCH 2/2] Activate CI for this branch --- .github/workflows/centos7.yml | 1 + .github/workflows/docker.yml | 3 ++- .github/workflows/oracle8.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 08aad7af3d..7c0b2a9b93 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - fix/try-ubuntu24-ci schedule: - cron: '21 2 * * *' workflow_call: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a20b346457..846118f838 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,10 +4,11 @@ on: branches: - 'docker/*' - dependabot/* + - fix/try-ubuntu24-ci jobs: docker_publish: - + runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index cacb05c48a..15066ecd6c 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -7,6 +7,7 @@ on: branches: - develop - dependabot/* + - fix/try-ubuntu24-ci schedule: - cron: '21 2 * * *'