From 008548a956573cf5b793ae1ebb387f7d3421214a Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Mon, 23 Sep 2024 13:23:54 +0200 Subject: [PATCH] force checkout google v9.11 --- .github/workflows/centos.yml | 4 ++-- .github/workflows/oracle.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows-cpp.yml | 22 ++-------------------- .github/workflows/windows-python.yml | 22 ++-------------------- 5 files changed, 10 insertions(+), 46 deletions(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index c342cf8..4c760fa 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -53,8 +53,8 @@ jobs: if: ${{ env.RELEASE_CREATED == 'false' }} shell: bash run: | - OR_REPO="https://github.com/rte-france/or-tools.git" - OR_REF=${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} + OR_REPO="https://github.com/google/or-tools.git" + OR_REF="9.11" echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV echo "OR_REF=$OR_REF" >> $GITHUB_ENV diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index a4f0c0a..8ecdeb2 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -116,8 +116,8 @@ jobs: if: ${{ env.RELEASE_CREATED == 'false' }} shell: bash run: | - OR_REPO="https://github.com/rte-france/or-tools.git" - OR_REF=${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} + OR_REPO="https://github.com/google/or-tools.git" + OR_REF="9.11" echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV echo "OR_REF=$OR_REF" >> $GITHUB_ENV diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 58e602b..4f2a363 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -68,8 +68,8 @@ jobs: if: ${{ env.RELEASE_CREATED == 'false' }} shell: bash run: | - OR_REPO="https://github.com/rte-france/or-tools.git" - OR_REF=${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} + OR_REPO="https://github.com/google/or-tools.git" + OR_REF="9.11" echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV echo "OR_REF=$OR_REF" >> $GITHUB_ENV diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index 9326a5b..75957ad 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -37,29 +37,11 @@ jobs: os: [windows-latest] sirius-release-tag: [ antares-integration-v1.4 ] steps: - - name: set or-tools repo vars if release - if: ${{ env.RELEASE_CREATED == 'true' }} - shell: bash - run: | - OR_REPO="https://github.com/google/or-tools.git" - TAGNAME="${{ github.event.release.tag_name }}" - TAGNAME_WITHOUT_SUFFIX=${TAGNAME%%-*} - echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV - echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV - - - name: Checkout or-tools if release - if: ${{ env.RELEASE_CREATED == 'true' }} + - name: Checkout or-tools uses: actions/checkout@v4 with: repository: google/or-tools - ref: ${{ env.OR_REF }} - - - name: Checkout or-tools not release - if: ${{ env.RELEASE_CREATED == 'false' }} - uses: actions/checkout@v4 - with: - repository: rte-france/or-tools - ref: ${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} + ref: "9.11" - name: Checkout this repository uses: actions/checkout@v4 diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index dfe4a48..68671e7 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -39,29 +39,11 @@ jobs: { version: "3.11", dir: Python311 }, ] steps: - - name: set or-tools repo vars if release - if: ${{ env.RELEASE_CREATED == 'true' }} - shell: bash - run: | - OR_REPO="https://github.com/google/or-tools.git" - TAGNAME="${{ github.event.release.tag_name }}" - TAGNAME_WITHOUT_SUFFIX=${TAGNAME%%-*} - echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV - echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV - - - name: Checkout or-tools if release - if: ${{ env.RELEASE_CREATED == 'true' }} + - name: Checkout or-tools uses: actions/checkout@v4 with: repository: google/or-tools - ref: ${{ env.OR_REF }} - - - name: Checkout or-tools not release - if: ${{ env.RELEASE_CREATED == 'false' }} - uses: actions/checkout@v4 - with: - repository: rte-france/or-tools - ref: ${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} + ref: "9.11" - name: Checkout this repository uses: actions/checkout@v4