Skip to content

Commit c0cd9cb

Browse files
committed
Try powershell
1 parent 9aa6aeb commit c0cd9cb

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

.github/scripts/upload_py_tools.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#!/bin/bash
22
CHANGED_FILES=$1
33
echo "Pushing '$CHANGED_FILES' as $GITHUB_ACTOR"
4-
5-
# git config --global github.user "$GITHUB_ACTOR"
6-
# git config --global user.name "$GITHUB_ACTOR"
7-
# git config --global user.email "[email protected]"
8-
# git add tools/get.exe
4+
git config --global github.user "$GITHUB_ACTOR"
5+
git config --global user.name "$GITHUB_ACTOR"
6+
git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
97
for tool in $CHANGED_FILES; do
108
echo "git add tools/$tool.exe"
119
done
12-
# git commit -m "Push binary to tools"
13-
# git push
14-
10+
git commit -m "Push binary to tools"
11+
git push

.github/workflows/build_py_tools.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,19 @@ jobs:
107107
for tool in ${{ env.CHANGED_TOOLS }}; do
108108
pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=.github/pytools/espressif.ico tools/$tool.py
109109
done
110-
# - name: Sign binaries
111-
# if: matrix.os == 'windows-latest'
112-
# env:
113-
# CERTIFICATE: ${{ secrets.CERTIFICATE }}
114-
# CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
115-
# shell: pwsh
116-
# run: |
117-
# if exist ./${{ env.DISTPATH }}/get.exe ./.github/pytools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/get.exe
110+
- name: Sign binaries
111+
if: matrix.os == 'windows-latest'
112+
env:
113+
CERTIFICATE: ${{ secrets.CERTIFICATE }}
114+
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
115+
shell: pwsh
116+
run: |
117+
$data = Write-Output ${{ env.CHANGED_TOOLS }}
118+
foreach ( $node in $data )
119+
{
120+
./.github/pytools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/$node.exe
121+
}
122+
# if exist ./${{ env.DISTPATH }}/get.exe ./.github/pytools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/get.exe
118123
- name: Test binaries
119124
shell: bash
120125
run: |
@@ -130,7 +135,6 @@ jobs:
130135
for tool in ${{ env.CHANGED_TOOLS }}; do
131136
cp -f ./${{ env.DISTPATH }}/$tool.exe tools/$tool.exe
132137
done
133-
# cp -Force ./${{ env.DISTPATH }}/get.exe tools/get.exe
134138
bash .github/scripts/upload_py_tools.sh "${{ env.CHANGED_TOOLS }}"
135139
- name: Archive artifact
136140
uses: actions/upload-artifact@master

tools/espota.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,3 +351,4 @@ def main(args):
351351

352352
if __name__ == '__main__':
353353
sys.exit(main(sys.argv))
354+

tools/get.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,3 +238,4 @@ def identify_platform():
238238
else:
239239
get_tool(tool)
240240
print('Platform Tools Installed')
241+

0 commit comments

Comments
 (0)