release commit v0.4.0

Hahihula · Hahihula · commit b9d14b7fbb76 · 2025-08-29T07:43:13.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -301,7 +301,7 @@ jobs:
           MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
         run: |
           echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p espressif build.keychain
+          security list-keychains | grep -q "build.keychain" || security create-keychain -p espressif build.keychain
           security default-keychain -s build.keychain
           security unlock-keychain -p espressif build.keychain
           security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
@@ -406,12 +406,12 @@ jobs:
           MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
         run: |
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          security list-keychains | grep -q "build.keychain" || security create-keychain -p espressif build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p espressif build.keychain
-          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k espressif build.keychain
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate_offline.p12
+          security create-keychain -p espressif build_offline.keychain
+          security default-keychain -s build_offline.keychain
+          security unlock-keychain -p espressif build_offline.keychain
+          security import certificate_offline.p12 -k build_offline.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k espressif build_offline.keychain
           codesign --entitlements eim.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" release_cli/${{ matrix.package_name }}/offline_installer_builder -v
           codesign -v -vvv --deep release_cli/${{ matrix.package_name }}/offline_installer_builder
 
@@ -448,6 +448,10 @@ jobs:
     with:
       ref: ${{ github.event.pull_request.head.ref || github.ref }}
       run_id: ${{ github.run_id }}
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      DL_DISTRIBUTION_ID: ${{ secrets.DL_DISTRIBUTION_ID }}
 
   build-gui:
     name: Build GUI (${{ matrix.package_name }})
@@ -764,6 +768,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: ap-east-1
+          DL_DISTRIBUTION_ID: ${{ secrets.DL_DISTRIBUTION_ID }}
         run: |
           # GUI release info
           curl -s https://api.github.com/repos/espressif/idf-im-ui/releases/latest > eim_unified_release.json
diff --git a/.github/workflows/build_offline_installer_archives.yaml b/.github/workflows/build_offline_installer_archives.yaml
@@ -9,6 +9,13 @@ on:
       run_id:
         required: true
         type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      DL_DISTRIBUTION_ID:
+        required: true
 
   workflow_dispatch:
     inputs:
@@ -22,6 +29,7 @@ jobs:
     name: Build Offline Archives (${{ matrix.package_name }})
     runs-on: ${{ matrix.os }}
     continue-on-error: true
+
     strategy:
       fail-fast: false
       matrix:
@@ -112,16 +120,119 @@ jobs:
           path: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
           retention-days: 30
 
-      - name: Upload to release assets
-        if: github.event_name == 'release'
-        uses: actions/upload-release-asset@v1
+      # Release assets are limited to 2gb, until optimisation makes the archive less than 2gigs...
+      # - name: Upload to release assets
+      #   if: github.event_name == 'release'
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ github.event.release.upload_url }}
+      #     asset_path: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
+      #     asset_name: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
+      #     asset_content_type: application/zip
+
+      - name: Upload installer to S3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ap-east-1
+          VERSION: ${{ env.VERSION }}
+          PACKAGE_NAME: ${{ matrix.package_name }}
+          FILENAME: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
+        shell: bash
+        run: |
+          # Only upload the installer ZIP
+          aws s3 cp --acl=public-read "$FILENAME" "s3://espdldata/dl/eim/$FILENAME"
+
+      - name: Create build info file
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ env.VERSION }}
+          PACKAGE_NAME: ${{ matrix.package_name }}
+          FILENAME: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
+        shell: bash
+        run: |
+          # Create build info file
+          jq -n \
+            --arg version "$VERSION" \
+            --arg platform "$PACKAGE_NAME" \
+            --arg filename "$FILENAME" \
+            '{"version": $version, "platform": $platform, "filename": $filename}' \
+            > build-info.json
+
+      - name: Save build info as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-info-${{ matrix.package_name }}
+          path: build-info.json
+
+  update-json:
+    needs: build-offline-archives
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all build info artifacts
+        uses: actions/download-artifact@v4
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
-          asset_name: offline_installer-${{ matrix.package_name }}-${{ env.VERSION }}.zip
-          asset_content_type: application/zip
+          pattern: build-info-*
+          merge-multiple: true
+          path: build-infos/
+
+      - name: Update offline_archives.json
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ap-east-1
+          DL_DISTRIBUTION_ID: ${{ secrets.DL_DISTRIBUTION_ID }}
+          VERSION: ${{ env.VERSION }}
+        shell: bash
+        run: |
+          # Download existing JSON or create empty array
+          if curl -f -s -o offline_archives.json http://dl.espressif.com/dl/eim/offline_archives.json; then
+            echo "Downloaded existing offline_archives.json"
+            if ! jq empty offline_archives.json 2>/dev/null; then
+              echo "Downloaded JSON is invalid, creating new empty array"
+              echo "[]" > offline_archives.json
+            fi
+          else
+            echo "offline_archives.json does not exist, creating new empty array"
+            echo "[]" > offline_archives.json
+          fi
+
+          # Ensure valid JSON array
+          if [ ! -s offline_archives.json ] || ! jq -e 'type == "array"' offline_archives.json >/dev/null 2>&1; then
+            echo "File is empty or not a valid JSON array, initializing with empty array"
+            echo "[]" > offline_archives.json
+          fi
+
+          # Collect all new build info
+          new_entries="[]"
+          for build_info in build-infos/*.json; do
+            if [ -f "$build_info" ]; then
+              entry=$(cat "$build_info")
+              new_entries=$(echo "$new_entries" | jq ". + [$entry]")
+            fi
+          done
+
+          # Remove existing entries with same filenames, then add all new entries
+          updated_json=$(jq --argjson new_entries "$new_entries" '
+            . as $original |
+            ($new_entries | map(.filename)) as $new_filenames |
+            ($original | map(select(.filename as $f | $new_filenames | index($f) | not))) + $new_entries
+          ' offline_archives.json)
+
+          echo "$updated_json" > updated_archives.json
+
+          # Verify the updated JSON is valid
+          if ! jq empty updated_archives.json 2>/dev/null; then
+            echo "Error: Generated JSON is invalid"
+            exit 1
+          fi
+
+          # Upload updated JSON to S3
+          aws s3 cp --acl=public-read updated_archives.json s3://espdldata/dl/eim/offline_archives.json
+
+          # Invalidate Cache
+          aws cloudfront create-invalidation --distribution-id ${DL_DISTRIBUTION_ID} --paths "/dl/eim/offline_archives.json"
 
   Autotest-CLI-Offline:
     needs: [build-offline-archives]
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eim",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "eim"
-version = "0.3.0"
+version = "0.4.0"
 description = "ESP-IDF Installation Manager"
 authors = ["petr.gadorek@espressif.com"]
 edition = "2021"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eim",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.3.0",`
	`4`	`+ "version": "0.4.0",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite",`