Skip to content

Commit 301ac8f

Browse files
mxaminmxamin
committed
Enable all workflows
1 parent 855c6c4 commit 301ac8f

6 files changed

Lines changed: 33 additions & 22 deletions

File tree

‎.github/workflows/cache_libs.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,6 @@ jobs:
124124
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125125
run: python build_libs_xmlsec.py --download-only
126126

127-
- name: List downloaded libs
128-
run: |
129-
bash -c '
130-
echo "libs directory:"
131-
ls -la libs || true
132-
echo
133-
echo "Downloaded files:"
134-
find libs -maxdepth 1 -type f | sort || true
135-
'
136-
137127
- name: Check Windows library versions
138128
if: ${{ contains(matrix.os, 'windows-') }}
139129
run: |

.github/workflows/linuxbrew.yml.off renamed to .github/workflows/linuxbrew.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,34 @@ on: [push, pull_request]
33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: ${{ github.ref_name != 'master' }}
6+
67
jobs:
78
linuxbrew:
89
runs-on: ubuntu-latest
10+
911
strategy:
1012
matrix:
1113
python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
14+
1215
env:
1316
# For some unknown reason, linuxbrew tries to use "gcc-11" by default, which doesn't exist.
1417
CC: gcc
18+
1519
steps:
1620
- uses: actions/checkout@v3
21+
1722
- name: Install brew
1823
run: |
1924
sudo apt install -y build-essential procps curl file git
2025
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
2126
echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH
27+
2228
- name: Install build dependencies
2329
run: |
2430
brew update
2531
brew install python@${{ matrix.python }} gcc libxml2 libxmlsec1 pkg-config
2632
echo "/home/linuxbrew/.linuxbrew/opt/python@${{ matrix.python }}/libexec/bin" >> $GITHUB_PATH
33+
2734
- name: Build wheel
2835
run: |
2936
python3 -m venv build_venv
@@ -33,6 +40,7 @@ jobs:
3340
export LDFLAGS="-L$(brew --prefix)/lib"
3441
python3 -m build
3542
rm -rf build/
43+
3644
- name: Run tests
3745
run: |
3846
python3 -m venv test_venv

.github/workflows/macosx.yml.off renamed to .github/workflows/macosx.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,29 @@ on: [push, pull_request]
33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: ${{ github.ref_name != 'master' }}
6+
67
jobs:
78
macosx:
89
runs-on: macos-latest
10+
911
strategy:
1012
matrix:
1113
python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1214
static_deps: ["static", ""]
15+
1316
steps:
1417
- uses: actions/checkout@v3
18+
1519
- name: Setup Python
1620
uses: actions/setup-python@v4
1721
with:
1822
python-version: ${{ matrix.python }}
23+
1924
- name: Install build dependencies
2025
run: |
2126
pip install --upgrade pip setuptools wheel build
2227
brew install libxml2 libxmlsec1 pkg-config
28+
2329
- name: Build macosx_x86_64 wheel
2430
env:
2531
CC: clang
@@ -32,23 +38,27 @@ jobs:
3238
export PYXMLSEC_LIBXML2_VERSION="$(pkg-config --modversion libxml-2.0)"
3339
python -m build
3440
rm -rf build/
41+
3542
- name: Set environment variables
3643
shell: bash
3744
run: |
3845
echo "PKGVER=$(python setup.py --version)" >> $GITHUB_ENV
3946
echo "LLVM_PROFILE_FILE=pyxmlsec.profraw" >> $GITHUB_ENV
47+
4048
- name: Install test dependencies
4149
run: |
4250
export PKG_CONFIG_PATH="$(brew --prefix)/opt/libxml2/lib/pkgconfig"
4351
pip install coverage --upgrade --no-binary=lxml -r requirements-test.txt
4452
pip install xmlsec --only-binary=xmlsec --no-index --find-links=dist/
4553
echo "PYXMLSEC_LIBFILE=$(python -c 'import xmlsec; print(xmlsec.__file__)')" >> $GITHUB_ENV
54+
4655
- name: Run tests
4756
run: |
4857
coverage run -m pytest -v --color=yes
58+
4959
- name: Report coverage to codecov
60+
if: matrix.static_deps != 'static'
5061
run: |
5162
/Library/Developer/CommandLineTools/usr/bin/llvm-profdata merge -sparse ${{ env.LLVM_PROFILE_FILE }} -output pyxmlsec.profdata
5263
/Library/Developer/CommandLineTools/usr/bin/llvm-cov show ${{ env.PYXMLSEC_LIBFILE }} --arch=$(uname -m) --instr-profile=pyxmlsec.profdata src > coverage.txt
5364
bash <(curl -s https://codecov.io/bash) -f coverage.txt
54-
if: matrix.static_deps != 'static'

.github/workflows/sdist.yml.off renamed to .github/workflows/sdist.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,41 @@ on: [push, pull_request]
33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: ${{ github.ref_name != 'master' }}
6+
67
jobs:
78
sdist:
89
# Avoid Ubuntu 24.04 in sdist workflows, because it contains libxmlsec1-dev
910
# v1.2.39, which has a bug that causes tests/test_pkcs11.py to fail.
1011
# (It thinks the softhsm engine has a public key instead of a private key.)
1112
# libxmlsec1 <=1.2.33 or >=1.2.42 works. TODO: Try 26.04 when available.
1213
runs-on: ubuntu-22.04
14+
1315
strategy:
1416
matrix:
1517
python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
18+
1619
steps:
1720
- uses: actions/checkout@v3
18-
- name: Set up Python
19-
uses: actions/setup-python@v4
21+
22+
- uses: actions/setup-python@v4
2023
with:
2124
python-version: ${{ matrix.python }}
25+
2226
- name: Install build dependencies
2327
run: |
2428
pip install --upgrade pip setuptools wheel
29+
2530
- name: Package source dist
2631
run: |
2732
python setup.py sdist
33+
2834
- name: Install test dependencies
2935
run: |
3036
sudo apt-get update
3137
sudo apt-get install libxml2-dev libxmlsec1-dev libxmlsec1-openssl opensc softhsm2 libengine-pkcs11-openssl
3238
pip install --upgrade -r requirements-test.txt --no-binary lxml
3339
pip install dist/xmlsec-$(python setup.py --version).tar.gz
40+
3441
- name: Run tests
3542
run: |
3643
pytest -v --color=yes

.github/workflows/wheels.yml.off renamed to .github/workflows/wheels.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,8 @@ jobs:
106106
runs-on: ${{ matrix.os }}
107107

108108
env:
109-
LIBICONV_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBICONV_VERSION || needs.cache_libs.outputs.LIBICONV_VERSION }}
110109
LIBXML2_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBXML2_VERSION || needs.cache_libs.outputs.LIBXML2_VERSION }}
111110
LIBXSLT_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBXSLT_VERSION || needs.cache_libs.outputs.LIBXSLT_VERSION }}
112-
OPENSSL_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_OPENSSL_VERSION || needs.cache_libs.outputs.OPENSSL_VERSION }}
113-
XMLSEC1_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_XMLSEC1_VERSION || needs.cache_libs.outputs.XMLSEC1_VERSION }}
114-
ZLIB_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_ZLIB_VERSION || needs.cache_libs.outputs.ZLIB_VERSION }}
115111

116112
strategy:
117113
fail-fast: false

‎pyproject.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ line-ending = "lf"
142142
# cibuildwheel
143143
[tool.cibuildwheel]
144144
build = [
145-
# "cp39-*",
146-
# "cp310-*",
147-
# "cp311-*",
148-
# "cp312-*",
149-
# "cp313-*",
145+
"cp39-*",
146+
"cp310-*",
147+
"cp311-*",
148+
"cp312-*",
149+
"cp313-*",
150150
"cp314-*"
151151
]
152152
build-verbosity = 1

0 commit comments

Comments
 (0)