diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml index b8ddf12..52041ef 100644 --- a/.github/workflows/windows-cpp.yml +++ b/.github/workflows/windows-cpp.yml @@ -37,7 +37,7 @@ jobs: os: [windows-latest] sirius-release-tag: [ antares-integration-v1.4 ] steps: - - name: set or-tools repo vars release + - name: set or-tools repo vars if release if: ${{ env.RELEASE_CREATED == 'true' }} shell: bash run: | @@ -47,19 +47,18 @@ jobs: echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV - - name: set or-tools repo vars not release + - name: Checkout or-tools not release 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' }} - echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV - echo "OR_REF=$OR_REF" >> $GITHUB_ENV + uses: actions/checkout@v4 + with: + repository: rte-france/or-tools + ref: ${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} - - name: Checkout or-tools + - name: Checkout or-tools if release + if: ${{ env.RELEASE_CREATED == 'true' }} uses: actions/checkout@v4 with: - repository: ${{ env.OR_REPO }} + repository: google/or-tools ref: ${{ env.OR_REF }} - name: Checkout this repository diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml index 0888a16..8a19f3c 100644 --- a/.github/workflows/windows-python.yml +++ b/.github/workflows/windows-python.yml @@ -39,7 +39,7 @@ jobs: { version: "3.11", dir: Python311 }, ] steps: - - name: set or-tools repo vars release + - name: set or-tools repo vars if release if: ${{ env.RELEASE_CREATED == 'true' }} shell: bash run: | @@ -49,19 +49,18 @@ jobs: echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV - - name: set or-tools repo vars not release + - name: Checkout or-tools not release 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' }} - echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV - echo "OR_REF=$OR_REF" >> $GITHUB_ENV + uses: actions/checkout@v4 + with: + repository: rte-france/or-tools + ref: ${{ github.event.inputs.rtefrance_ortools_branch || 'main' }} - - name: Checkout or-tools + - name: Checkout or-tools if release + if: ${{ env.RELEASE_CREATED == 'true' }} uses: actions/checkout@v4 with: - repository: ${{ env.OR_REPO }} + repository: google/or-tools ref: ${{ env.OR_REF }} - name: Checkout this repository