Skip to content

Commit 9778acf

Browse files
committed
assets.yml: export PATH and clean Conan cache for the self-hosted runner jobs.
test.yml: use gcc for the cpp-linux-arm64 job. Add tests-debug-gcc-linux-arm64 and tests-release-gcc-linux-arm64 Conan profiles.
1 parent 64a654d commit 9778acf

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

.github/workflows/assets.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,14 @@ jobs:
8383
- name: Install dependencies
8484
run: |
8585
dnf install -y $SWIG_VERSION
86-
python_bin="/opt/python/${{ matrix.cpython_version }}/bin/python"
87-
${python_bin} -m pip install --upgrade conan wheel auditwheel
88-
pip_installation_folder=$(${python_bin} -m pip show --files conan | grep 'Location:' | sed 's/Location: //')
89-
conan_installation_folder_relative_path=$(${python_bin} -m pip show --files conan | grep '/bin/' | sed 's#\s\+\(.*\)/conan#\1#')
90-
conan_installation_folder="${pip_installation_folder}/${conan_installation_folder_relative_path}"
91-
echo "Conan installation folder: ${conan_installation_folder}"
92-
echo "${conan_installation_folder}" >> $GITHUB_PATH
86+
export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
87+
python -m pip install --upgrade conan wheel auditwheel
9388
- name: Build wheel
9489
run: |
95-
/opt/python/${{ matrix.cpython_version }}/bin/python setup.py bdist_wheel
96-
/opt/python/${{ matrix.cpython_version }}/bin/python -m auditwheel repair pybuild/dist/*.whl
90+
export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
91+
conan remove -c "*/*"
92+
python setup.py bdist_wheel
93+
python -m auditwheel repair pybuild/dist/*.whl
9794
- name: Wheel path
9895
id: wheel
9996
working-directory: wheelhouse
@@ -149,18 +146,14 @@ jobs:
149146
- name: Install dependencies
150147
run: |
151148
dnf install -y $BISON_VERSION $FLEX_VERSION $JAVA_VERSION $SWIG_VERSION
152-
python_bin="/opt/python/${{ matrix.cpython_version }}/bin/python"
153-
${python_bin} -m pip install --upgrade pip conan wheel auditwheel
154-
pip_installation_folder=$(${python_bin} -m pip show --files conan | grep 'Location:' | sed 's/Location: //')
155-
conan_installation_folder_relative_path=$(${python_bin} -m pip show --files conan | grep '/bin/' | sed 's#\s\+\(.*\)/conan#\1#')
156-
conan_installation_folder="${pip_installation_folder}/${conan_installation_folder_relative_path}"
157-
echo "Conan installation folder: ${conan_installation_folder}"
158-
echo "${conan_installation_folder}" >> $GITHUB_PATH
149+
export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
150+
python -m pip install --upgrade pip conan wheel auditwheel
159151
- name: Build wheel
160152
run: |
161-
conan remove -c "libqasm/*"
162-
/opt/python/${{ matrix.cpython_version }}/bin/python setup.py bdist_wheel
163-
/opt/python/${{ matrix.cpython_version }}/bin/python -m auditwheel repair pybuild/dist/*.whl
153+
export PATH="/opt/python/${{ matrix.cpython_version }}/bin:$PATH"
154+
conan remove -c "*/*"
155+
python setup.py bdist_wheel
156+
python -m auditwheel repair pybuild/dist/*.whl
164157
- name: Wheel path
165158
id: wheel
166159
working-directory: wheelhouse

.github/workflows/test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ jobs:
6464
conan_profile: tests-${{ matrix.build_type }}-msvc-windows-x64
6565
shell: bash
6666

67-
# We are observing an internal compiler error when building with gcc
68-
# So we are changing to clang for the Linux/ARM64 builds
6967
cpp-linux-arm64:
70-
name: "C++ tests (clang/Linux/ARM64)"
68+
name: "C++ tests (gcc/Linux/ARM64)"
7169
runs-on: [self-hosted, ARM64, Linux]
7270
container: python:3.11
7371
strategy:
@@ -92,7 +90,7 @@ jobs:
9290
- uses: ./.github/actions/cpp-tests
9391
with:
9492
build_type: ${{ matrix.build_type }}
95-
conan_profile: tests-${{ matrix.build_type }}-clang-linux-arm64
93+
conan_profile: tests-${{ matrix.build_type }}-gcc-linux-arm64
9694
shell: bash
9795

9896
cpp-macos-arm64:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include(tests-debug)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include(tests-release)
2+
3+
[conf]
4+
tools.build:cxxflags=["-Wno-error=maybe-uninitialized"]

0 commit comments

Comments
 (0)