Skip to content

Commit c147027

Browse files
committed
drop set-env usage in gh actions
Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
1 parent d5f461d commit c147027

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/macosx.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@ jobs:
1717
pip install --upgrade pip setuptools wheel
1818
brew install libxml2 libxmlsec1 pkg-config
1919
- name: Build macosx_x86_64 wheel
20+
env:
21+
CC: clang
22+
CFLAGS: "-fprofile-instr-generate -fcoverage-mapping"
23+
LDFLAGS: "-fprofile-instr-generate -fcoverage-mapping"
2024
run: |
2125
python setup.py bdist_wheel
26+
rm -rf build/
2227
- name: Set environment variables
2328
shell: bash
2429
run: |
25-
echo ::set-env name=PKGVER::$(python setup.py --version)
26-
echo ::set-env name=LLVM_PROFILE_FILE::"pyxmlsec-%p.profraw"
30+
echo "PKGVER=$(python setup.py --version)" >> $GITHUB_ENV
31+
echo "LLVM_PROFILE_FILE=pyxmlsec.profraw" >> $GITHUB_ENV
2732
- name: Install test dependencies
28-
env:
29-
CC: clang
30-
CFLAGS: "-fprofile-instr-generate -fcoverage-mapping"
31-
LDFLAGS: "-fprofile-instr-generate -fcoverage-mapping"
3233
run: |
33-
rm -rf build/
3434
pip install coverage --upgrade -r requirements-test.txt
3535
pip install xmlsec --only-binary=xmlsec --no-index --find-links=dist/
36+
echo "PYXMLSEC_LIBFILE=$(python -c 'import xmlsec; print(xmlsec.__file__)')" >> $GITHUB_ENV
3637
- name: Run tests
3738
run: |
3839
coverage run -m pytest -v --color=yes
3940
- name: Report coverage to codecov
4041
run: |
41-
LIBFILE=$(python -c "import xmlsec; print(xmlsec.__file__)")
42-
/Library/Developer/CommandLineTools/usr/bin/llvm-profdata merge -sparse pyxmlsec-*.profraw -output pyxmlsec.profdata
43-
/Library/Developer/CommandLineTools/usr/bin/llvm-cov show ${LIBFILE} -instr-profile=pyxmlsec.profdata src > coverage.txt
42+
/Library/Developer/CommandLineTools/usr/bin/llvm-profdata merge -sparse ${{ env.LLVM_PROFILE_FILE }} -output pyxmlsec.profdata
43+
/Library/Developer/CommandLineTools/usr/bin/llvm-cov show ${{ env.PYXMLSEC_LIBFILE }} -instr-profile=pyxmlsec.profdata src > coverage.txt
4444
bash <(curl -s https://codecov.io/bash) -f coverage.txt

.github/workflows/manylinux2010.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set environment variables
1616
shell: bash
1717
run: |
18-
echo ::set-env name=PKGVER::$(/opt/python/${{ matrix.python-abi }}/bin/python setup.py --version)
18+
echo "PKGVER=$(/opt/python/${{ matrix.python-abi }}/bin/python setup.py --version)" >> $GITHUB_ENV
1919
- name: Build linux_x86_64 wheel
2020
env:
2121
PYXMLSEC_STATIC_DEPS: true
@@ -24,10 +24,10 @@ jobs:
2424
- name: Label manylinux2010_x86_64 wheel
2525
run: |
2626
ls -la dist/
27-
auditwheel show dist/xmlsec-${PKGVER}-${{ matrix.python-abi }}-linux_x86_64.whl
28-
auditwheel repair dist/xmlsec-${PKGVER}-${{ matrix.python-abi }}-linux_x86_64.whl
27+
auditwheel show dist/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-linux_x86_64.whl
28+
auditwheel repair dist/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-linux_x86_64.whl
2929
ls -l wheelhouse/
30-
auditwheel show wheelhouse/xmlsec-${PKGVER}-${{ matrix.python-abi }}-manylinux2010_x86_64.whl
30+
auditwheel show wheelhouse/xmlsec-${{ env.PKGVER }}-${{ matrix.python-abi }}-manylinux2010_x86_64.whl
3131
- name: Install test dependencies
3232
run: |
3333
/opt/python/${{ matrix.python-abi }}/bin/pip install --upgrade -r requirements-test.txt

0 commit comments

Comments
 (0)