Skip to content

Commit 5df0b42

Browse files
committed
Merge branch 'main' into 2025
2 parents ff49188 + 81d7b39 commit 5df0b42

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

.github/workflows/python-package.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ jobs:
6262
run: |
6363
pytest --html=report.html --self-contained-html
6464
- name: Upload test report
65-
uses: actions/upload-artifact@v2
65+
uses: actions/upload-artifact@v4
6666
if: ${{ always() }}
6767
with:
68-
name: report.html
68+
name: report.html-${{ matrix.python-version }}
6969
path: report.html
7070

7171
- name: Coverage Report
7272
run: |
7373
pytest --cov-config=.coveragerc --cov-report=html --cov=pyafipws tests/
7474
- name: Upload coverage report
75-
uses: actions/upload-artifact@v2
75+
uses: actions/upload-artifact@v4
7676
if: ${{ always() }}
7777
with:
78-
name: Coverage_Report
78+
name: Coverage_Report-${{ matrix.python-version }}
7979
path: htmlcov

.github/workflows/windows-installer.yml

+19-10
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,38 @@ jobs:
8282
echo workflow trigger: "${{ github.ref }}" - "${{ github.ref_name }}"
8383
type dist/.env
8484
- name: Deploy distribution binaries
85-
uses: actions/upload-artifact@v3
85+
uses: actions/upload-artifact@v4
8686
with:
8787
name: dist-${{ matrix.targetplatform }}
88+
include-hidden-files: true
8889
path: |
8990
dist/
9091
- name: Deploy PyAfipWs Installer
91-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9293
with:
9394
name: PyAfipWs-Installer-${{ matrix.targetplatform }}
9495
path: |
95-
**/PyAfipWs-*-full.exe
96+
**/PyAfipWs-*.exe
9697
9798
test:
9899
name: "Full End-2-End test"
99100
needs: compile
100101
runs-on: windows-latest
101102
strategy:
102103
matrix:
103-
targetplatform: [x86, x64]
104+
targetplatform: [x64]
104105
steps:
106+
- uses: actions/checkout@v2
107+
with:
108+
fetch-depth: 0
105109
- name: Download distribution binaries
106110
uses: actions/[email protected]
107111
with:
108112
name: dist-${{ matrix.targetplatform }}
109113
- name: Download certificate and private key
110114
run: |
111-
Invoke-WebRequest -Uri "https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2021.zip" -OutFile reingart2019.zip
112-
Expand-Archive reingart2019.zip -DestinationPath .
115+
Invoke-WebRequest -Uri "https://www.sistemasagiles.com.ar/soft/pyafipws/reingart2023.zip" -OutFile reingart.zip
116+
Expand-Archive reingart.zip -DestinationPath .
113117
- name: Replace certificate and private key from secrets
114118
shell: pwsh
115119
env:
@@ -119,9 +123,9 @@ jobs:
119123
TARGET_PLATFORM: ${{ matrix.targetplatform }}
120124
if: "${{ env.AFIP_TEST_PRIV_KEY != '' }}"
121125
run: |
122-
"$env:AFIP_TEST_PRIV_KEY" | Out-File -FilePath reingart.key
123-
$( if ( "$env:TARGET_PLATFORM" -eq "x64" ) { "$env:AFIP_TEST_CERT2" } else { "$env:AFIP_TEST_CERT3" } ) | Out-File -FilePath reingart.crt
124-
Get-Content -Path reingart.crt
126+
"$env:AFIP_TEST_PRIV_KEY" | Out-File -FilePath reingart-gh.key
127+
$( if ( "$env:TARGET_PLATFORM" -eq "x64" ) { "$env:AFIP_TEST_CERT2" } else { "$env:AFIP_TEST_CERT3" } ) | Out-File -FilePath reingart-gh.crt
128+
Get-Content -Path reingart-gh.crt
125129
Write-Host "TARGET_PLATFORM: $env:TARGET_PLATFORM"
126130
- name: Copy rece.ini file
127131
run: |
@@ -131,14 +135,17 @@ jobs:
131135
run: |
132136
Install-Module -Name Pester -Force -SkipPublisherCheck -Scope CurrentUser
133137
- name: Test PyI25 COM server automation
138+
continue-on-error: true
134139
run: |
135140
Import-Module Pester
136141
Invoke-Pester .\tests\powershell\test_pyi25.ps1
137142
- name: Register PyQR component
143+
continue-on-error: true
138144
run: |
139145
python register_pyqr.py
140146
Get-Content -Path $Env:APPDATA\pyqr.log -ErrorAction SilentlyContinue
141147
- name: Test PyQR COM server automation
148+
continue-on-error: true
142149
run: |
143150
Import-Module Pester
144151
Invoke-Pester .\tests\powershell\test_pyqr.ps1
@@ -167,9 +174,11 @@ jobs:
167174
run: |
168175
.\tests\test_wsaa.ps1
169176
- name: Test WSFEv1 COM server automation
177+
continue-on-error: true
170178
run: |
171179
.\tests\test_wsfev1.ps1
172180
- name: Test RECE1 command line interface tool
181+
continue-on-error: true
173182
run: |
174183
$env:Path += ";$pwd"
175184
. .\tests\test_rece1.ps1
@@ -220,4 +229,4 @@ jobs:
220229
PyAfipWs-Installer-x64.exe
221230
PyAfipWs-Installer-x86.exe
222231
dist-32.zip
223-
dist-64.zip
232+
dist-64.zip

0 commit comments

Comments
 (0)