From 7a974551df823df950f00d4264082f416806264e Mon Sep 17 00:00:00 2001 From: Manoel Marques Date: Wed, 14 Apr 2021 18:49:41 -0400 Subject: [PATCH] Make sure CI gets Qiskit dependencies from pypi on stable (#140) (#141) --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 294b7cb16e..f3dc5eff6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: python-version: ${{ matrix.python-version }} - uses: ./.github/actions/install-libraries - uses: ./.github/actions/install-master-dependencies - if: ${{ !startsWith(github.ref, 'refs/heads/stable') }} + if: ${{ !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }} - uses: ./.github/actions/install-nature - name: Install Dependencies run: | @@ -91,7 +91,7 @@ jobs: python-version: ${{ matrix.python-version }} - uses: ./.github/actions/install-libraries - uses: ./.github/actions/install-master-dependencies - if: ${{ !startsWith(github.ref, 'refs/heads/stable') }} + if: ${{ !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }} - uses: ./.github/actions/install-nature - run: make lint if: ${{ !cancelled() }} @@ -121,7 +121,7 @@ jobs: if: ${{ matrix.python-version < 3.8 }} - uses: ./.github/actions/install-libraries - uses: ./.github/actions/install-master-dependencies - if: ${{ !startsWith(github.ref, 'refs/heads/stable') }} + if: ${{ !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }} - uses: ./.github/actions/install-nature - name: Install Dependencies run: | @@ -171,7 +171,7 @@ jobs: python-version: ${{ matrix.python-version }} - uses: ./.github/actions/install-libraries - uses: ./.github/actions/install-master-dependencies - if: ${{ !startsWith(github.ref, 'refs/heads/stable') }} + if: ${{ !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }} - uses: ./.github/actions/install-nature - name: Install Dependencies run: |