Skip to content

Commit ab61881

Browse files
sigmaaasigmaaa
committed
fix: fixing ci yaml and formatting
1 parent 405b2a4 commit ab61881

File tree

1 file changed

+57
-25
lines changed

1 file changed

+57
-25
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,35 @@ jobs:
3131
echo "VERSION=$version" >> $GITHUB_ENV
3232
echo "VERSION=$version" >> $GITHUB_OUTPUT
3333
34-
- name: Upload build artifacts
34+
- name: Upload build artifacts (update site)
3535
if: ${{ !cancelled() }}
36-
run: |
37-
for platform in \
38-
"com.espressif.idf.update-${VERSION}:releng/com.espressif.idf.update/target/repository" \
39-
"Espressif-IDE-${VERSION}-win32:releng/com.espressif.idf.product/target/products/Espressif-IDE-${VERSION}-win32.win32.x86_64.zip" \
40-
"Espressif-IDE-${VERSION}-linux.gtk.x86_64:releng/com.espressif.idf.product/target/products/Espressif-IDE-${VERSION}-linux.gtk.x86_64.tar.gz" \
41-
"Espressif-IDE-${VERSION}-linux.gtk.aarch64:releng/com.espressif.idf.product/target/products/Espressif-IDE-${VERSION}-linux.gtk.aarch64.tar.gz"; do
42-
name=${platform%%:*}
43-
path=${platform##*:}
44-
echo "Uploading $name"
45-
gh actions upload-artifact --name "$name" --path "$path"
46-
done
47-
48-
- name: Codesign and create DMGs (macOS)
36+
uses: actions/upload-artifact@v4
37+
with:
38+
name: com.espressif.idf.update-${{ env.VERSION }}
39+
path: releng/com.espressif.idf.update/target/repository
40+
41+
- name: Upload Windows x86_64 artifact
42+
if: ${{ !cancelled() }}
43+
uses: actions/upload-artifact@v4
44+
with:
45+
name: Espressif-IDE-${{ env.VERSION }}-win32
46+
path: releng/com.espressif.idf.product/target/products/Espressif-IDE-${{ env.VERSION }}-win32.win32.x86_64.zip
47+
48+
- name: Upload Linux x86_64 artifact
49+
if: ${{ !cancelled() }}
50+
uses: actions/upload-artifact@v4
51+
with:
52+
name: Espressif-IDE-${{ env.VERSION }}-linux.gtk.x86_64
53+
path: releng/com.espressif.idf.product/target/products/Espressif-IDE-${{ env.VERSION }}-linux.gtk.x86_64.tar.gz
54+
55+
- name: Upload Linux ARM64 artifact
56+
if: ${{ !cancelled() }}
57+
uses: actions/upload-artifact@v4
58+
with:
59+
name: Espressif-IDE-${{ env.VERSION }}-linux.gtk.aarch64
60+
path: releng/com.espressif.idf.product/target/products/Espressif-IDE-${{ env.VERSION }}-linux.gtk.aarch64.tar.gz
61+
62+
- name: Codesign Espressif-IDE
4963
env:
5064
MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
5165
MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
@@ -57,19 +71,37 @@ jobs:
5771
/usr/bin/security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
5872
/usr/bin/security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k espressif build.keychain
5973
60-
for arch in x86_64 aarch64; do
61-
/usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement \
62-
--options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" \
63-
$PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/$arch/Espressif-IDE.app -v
64-
/usr/bin/codesign -v -vvv --deep $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/$arch/Espressif-IDE.app
74+
echo "codesigning espressif-ide-macosx.cocoa.x86_64"
75+
/usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/x86_64/Espressif-IDE.app -v
76+
/usr/bin/codesign -v -vvv --deep $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/x86_64/Espressif-IDE.app
77+
78+
echo "codesigning espressif-ide-macosx.cocoa.aarch64"
79+
/usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/aarch64/Espressif-IDE.app -v
80+
/usr/bin/codesign -v -vvv --deep $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/aarch64/Espressif-IDE.app
6581
66-
$PWD/releng/ide-dmg-builder/ide-dmg-builder${arch == "aarch64" && "-aarch64" || ""}.sh
67-
/usr/bin/codesign --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" \
68-
$PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-$arch.dmg -v
69-
/usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-$arch.dmg
82+
echo "Creating dmg for espressif-ide-macosx.cocoa.x86_64"
83+
$PWD/releng/ide-dmg-builder/ide-dmg-builder.sh
84+
/usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg -v
85+
/usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
7086
71-
gh actions upload-artifact --name Espressif-IDE-${VERSION}-macosx.cocoa-$arch --path $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-$arch.dmg
72-
done
87+
echo "Creating dmg for espressif-ide-macosx.cocoa.aarch64"
88+
$PWD/releng/ide-dmg-builder/ide-dmg-builder-aarch64.sh
89+
/usr/bin/codesign --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg -v
90+
/usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
91+
92+
- name: Upload espressif-ide-macosx.cocoa.x86_64 dmg
93+
if: ${{ !cancelled() }}
94+
uses: actions/upload-artifact@v4
95+
with:
96+
name: Espressif-IDE-${{ env.VERSION }}-macosx.cocoa.x86_64
97+
path: releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
98+
99+
- name: Upload espressif-ide-macosx.cocoa.aarch64 dmg
100+
if: ${{ !cancelled() }}
101+
uses: actions/upload-artifact@v4
102+
with:
103+
name: Espressif-IDE-${{ env.VERSION }}-macosx.cocoa.aarch64
104+
path: releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
73105

74106
build_and_test:
75107
strategy:

0 commit comments

Comments
 (0)