Skip to content

Commit f5eb6bd

Browse files
committed
Test
Test Fix Test Test Fix
1 parent 84167f6 commit f5eb6bd

File tree

3 files changed

+256
-47
lines changed

3 files changed

+256
-47
lines changed

.github/scripts/upload_py_tools.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
CHANGED_FILES=$1
3-
echo "Pushing '$CHANGED_FILES' as github-actions"
4-
git config --global github.user "github-actions"
5-
git config --global user.name "github-actions"
6-
git config --global user.email "github-actions@github.com"
3+
echo "Pushing '$CHANGED_FILES' as github-actions[bot]"
4+
git config --global github.user "github-actions[bot]"
5+
git config --global user.name "github-actions[bot]"
6+
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
77
for tool in $CHANGED_FILES; do
88
git add tools/$tool.exe
99
done

.github/workflows/build_py_tools.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,33 @@ jobs:
3939
echo "$file was changed"
4040
done
4141
42+
build-matrix:
43+
name: Create matrix for building python tools binaries
44+
runs-on: ubuntu-latest
45+
needs: find-changed-tools
46+
if: needs.find-changed-tools.outputs.any_changed == 'true'
47+
outputs:
48+
matrix: ${{ steps.set-matrix.outputs.matrix }}
49+
steps:
50+
- name: Set matrix
51+
id: set-matrix
52+
run: |
53+
matrix='["windows-latest", "macos-latest", "ubuntu-20.04"'
54+
if [ '${{github.repository}}' == 'espressif/arduino-esp32' ]; then
55+
matrix+=', "ARM", "ARM64"'
56+
fi
57+
58+
echo "matrix=$matrix]" >> $GITHUB_OUTPUT
59+
4260
build-pytools-binaries:
4361
name: Build python tools binaries for ${{ matrix.os }}
4462
runs-on: ${{ matrix.os }}
45-
needs: find-changed-tools
63+
needs: [find-changed-tools, build-matrix]
4664
if: needs.find-changed-tools.outputs.any_changed == 'true'
4765
strategy:
4866
fail-fast: false
4967
matrix:
50-
os: [windows-latest, macos-latest, ubuntu-20.04, ARM, ARM64]
68+
os: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
5169
include:
5270
- os: windows-latest
5371
TARGET: win64
@@ -108,7 +126,7 @@ jobs:
108126
pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=.github/pytools/espressif.ico tools/$tool.py
109127
done
110128
- name: Sign binaries
111-
if: matrix.os == 'windows-latest'
129+
if: matrix.os == 'windows-latest' && env.CERTIFICATE != '' && env.CERTIFICATE_PASSWORD != ''
112130
env:
113131
CERTIFICATE: ${{ secrets.CERTIFICATE }}
114132
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}

0 commit comments

Comments
 (0)