From 6fbf2813ec0e7a16e73c30db569444cff7a44435 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:20:08 +0100 Subject: [PATCH 1/6] CastXML for x86_64 --- .github/workflows/tests.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0860c814..768d5713 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,6 +13,7 @@ jobs: strategy: fail-fast: false matrix: + arch: [x86_64] include: # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 @@ -21,7 +22,7 @@ jobs: python-version: "3.13" castxml-epic: 0 cppstd: "-std=c++98" - + - os: ubuntu-22.04 compiler: clang++ clang-version: 14 @@ -42,7 +43,7 @@ jobs: python-version: "3.13" castxml-epic: 1 cppstd: "-std=c++98" - + # UBUNTU 24.04 - CASTXML EPIC 0 - os: ubuntu-24.04 compiler: clang++ @@ -152,14 +153,21 @@ jobs: echo "compiler_path=/usr/bin/${{ matrix.compiler }}-${{ matrix.clang-version }}" >> tests/xml_generator.cfg echo "ccflags=${{ matrix.cppstd }}" >> tests/xml_generator.cfg - - name: Setup castxml for Linux - if: contains(matrix.os, 'ubuntu') + # ─── Setup CastXML for Linux x86_64 ────────────────────────────── + - name: Setup CastXML for Linux x86_64 (Ubuntu 24.04) + if: matrix.os == 'ubuntu-24.04' && matrix.arch == 'x86_64' run: | - wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/bdbb67a10c5f8d1b738cd19cb074f409d4803e8077cb8c1072ef4eaf738fa871a73643f9c8282d58cae28d188df842c82ad6620b6d590b0396a0172a27438dce/download | tar zxf - -C ~/ - - name: Setup castxml for Mac - if: contains(matrix.os, 'macos') + wget -q -O ~/castxml-ubuntu-24.04-x86_64.tar.gz https://github.com/CastXML/CastXMLSuperbuild/releases/download/v0.6.11.post1/castxml-ubuntu-24.04-x86_64.tar.gz + tar -xzf ~/castxml-ubuntu-24.04-x86_64.tar.gz -C ~/ + chmod +x ~/castxml/bin/castxml + + - name: Setup CastXML for Linux x86_64 (Ubuntu 22.04) + if: matrix.os == 'ubuntu-22.04' && matrix.arch == 'x86_64' run: | - wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/5d937e938f7b882a3a3e7941e68f8312d0898aaf2082e00003dd362b1ba70b98b0a08706a1be28e71652a6a0f1e66f89768b5eaa20e5a100592d5b3deefec3f0/download | tar zxf - -C ~/ + wget -q -O ~/castxml-ubuntu-22.04-x86_64.tar.gz https://github.com/CastXML/CastXMLSuperbuild/releases/download/v0.6.11.post1/castxml-ubuntu-22.04-x86_64.tar.gz + tar -xzf ~/castxml-ubuntu-22.04-x86_64.tar.gz -C ~/ + chmod +x ~/castxml/bin/castxml + - name: Run tests run: | export PATH=~/castxml/bin:$PATH From ec42e915bd12214bed7850e24cfdb3ab871c4af9 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:29:39 +0100 Subject: [PATCH 2/6] rebase --- .github/workflows/tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 768d5713..3e0bf95b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,8 +12,8 @@ jobs: strategy: fail-fast: false + arch: [x86_64] matrix: - arch: [x86_64] include: # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 @@ -168,7 +168,11 @@ jobs: tar -xzf ~/castxml-ubuntu-22.04-x86_64.tar.gz -C ~/ chmod +x ~/castxml/bin/castxml + - name: Setup castxml for Mac + if: contains(matrix.os, 'macos') + run: | + wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/5d937e938f7b882a3a3e7941e68f8312d0898aaf2082e00003dd362b1ba70b98b0a08706a1be28e71652a6a0f1e66f89768b5eaa20e5a100592d5b3deefec3f0/download | tar zxf - -C ~/ - name: Run tests run: | export PATH=~/castxml/bin:$PATH - pytest tests + pytest tests \ No newline at end of file From 338a012d7df4a470280b1b24a4e5dde2e62a1636 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:32:19 +0100 Subject: [PATCH 3/6] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e0bf95b..37f63607 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,8 +12,8 @@ jobs: strategy: fail-fast: false - arch: [x86_64] matrix: + arch: [x86_64] include: # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 @@ -175,4 +175,4 @@ jobs: - name: Run tests run: | export PATH=~/castxml/bin:$PATH - pytest tests \ No newline at end of file + pytest tests From 9bb69c9e171e1d319dd31d01a5d7b2449788d170 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:36:01 +0100 Subject: [PATCH 4/6] rebase --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e0bf95b..2c874f63 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,8 +12,8 @@ jobs: strategy: fail-fast: false - arch: [x86_64] matrix: + arch: [ x86_64 ] include: # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 From e03821c3e0d72f68733ff81d4a0c9d692a766d1c Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:36:29 +0100 Subject: [PATCH 5/6] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 37f63607..dc35080c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86_64] + arch: [ x86_64 ] include: # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 From 9745f2d2fc3f79fe69dc5101cc7c7ca2f2e07012 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 19 Feb 2025 23:38:39 +0100 Subject: [PATCH 6/6] rebase --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc35080c..0eed25b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -172,6 +172,7 @@ jobs: if: contains(matrix.os, 'macos') run: | wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/5d937e938f7b882a3a3e7941e68f8312d0898aaf2082e00003dd362b1ba70b98b0a08706a1be28e71652a6a0f1e66f89768b5eaa20e5a100592d5b3deefec3f0/download | tar zxf - -C ~/ + - name: Run tests run: | export PATH=~/castxml/bin:$PATH