Skip to content

Commit

Permalink
Update CI to use latest windows (#565)
Browse files Browse the repository at this point in the history
  • Loading branch information
woodsp-ibm authored Nov 4, 2023
1 parent 592385e commit 31975d6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/actions/install-main-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
run: |
if [ "${{ inputs.qiskit-main }}" == "true" ]; then
echo 'Install Qiskit from Main'
if [ "${{ inputs.os }}" == "windows-2019" ]; then
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand Down Expand Up @@ -77,7 +77,7 @@ runs:
fi
else
echo 'Install Qiskit from Stable'
if [ "${{ inputs.os }}" == "windows-2019" ]; then
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand All @@ -87,7 +87,7 @@ runs:
- name: Install stable Aer
run: |
echo 'Install stable Aer'
if [ "${{ inputs.os }}" == "windows-2019" ]; then
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-optimization/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
using: "composite"
steps:
- run : |
if [ "${{ inputs.os }}" == "windows-2019" ]; then
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
env:
PYTHONWARNINGS: default
run: |
if [ "${{ inputs.os }}" == "windows-2019" ]; then
if [ "${{ inputs.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ jobs:
python-version: 3.8
- os: macos-latest
python-version: '3.10'
- os: windows-2019
- os: windows-latest
python-version: 3.8
- os: windows-2019
- os: windows-latest
python-version: '3.10'
steps:
- uses: actions/checkout@v3
Expand All @@ -142,7 +142,7 @@ jobs:
conda create -y -n scsenv python=${{ matrix.python-version }} -c conda-forge
conda activate scsenv
conda install -y scs lapack cvxpy -c conda-forge
if: ${{ matrix.os == 'windows-2019' }}
if: ${{ matrix.os == 'windows-latest' }}
shell: bash
- uses: ./.github/actions/install-main-dependencies
with:
Expand All @@ -154,15 +154,15 @@ jobs:
os: ${{ matrix.os }}
- name: Run lint
run: |
if [ "${{ matrix.os }}" == "windows-2019" ]; then
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
make lint
shell: bash
- name: Run mypy
run: |
if [ "${{ matrix.os }}" == "windows-2019" ]; then
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand All @@ -179,7 +179,7 @@ jobs:
if: ${{ !cancelled() }}
- name: Deprecation Messages
run: |
if [ "${{ matrix.os }}" == "windows-2019" ]; then
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand All @@ -188,7 +188,7 @@ jobs:
shell: bash
- name: Coverage combine
run: |
if [ "${{ matrix.os }}" == "windows-2019" ]; then
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand All @@ -204,7 +204,7 @@ jobs:
env:
PYTHONWARNINGS: default
run: |
if [ "${{ matrix.os }}" == "windows-2019" ]; then
if [ "${{ matrix.os }}" == "windows-latest" ]; then
source "$CONDA/etc/profile.d/conda.sh"
conda activate scsenv
fi
Expand Down Expand Up @@ -333,11 +333,11 @@ jobs:
path: /tmp/m310
- uses: actions/download-artifact@v3
with:
name: windows-2019-3.8
name: windows-latest-3.8
path: /tmp/w38
- uses: actions/download-artifact@v3
with:
name: windows-2019-3.10
name: windows-latest-3.10
path: /tmp/w310
- name: Install Dependencies
run: pip install -U coverage coveralls diff-cover
Expand Down

0 comments on commit 31975d6

Please sign in to comment.