tools: prepare release 2.9 with ESP-IDFv4.2

espressif · Jun 15, 2021 · 08bc3bd · 08bc3bd
1 parent 7fa1ce1
commit 08bc3bd
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/.github/workflows/test-offline-installer-dispatch.yml b/.github/workflows/test-offline-installer-dispatch.yml
@@ -6,15 +6,15 @@ on:
       idf_version:
         description: 'IDF Version'
         required: true
-        default: 'v4.2.1'
+        default: 'v4.3'
       idf_short_version:
         description: 'IDF Version - only major and minor numbers without any "v" contained in name of desktop link'
         required: true
-        default: '4.2'
+        default: '4.3'
       installer_url:
         description: 'Installer URL'
         required: true
-        default: 'https://github.com/espressif/idf-installer/releases/download/offline-2.8-beta-07/esp-idf-tools-setup-offline-2.8-beta-07.exe'
+        default: 'https://github.com/espressif/idf-installer/releases/download/offline-2.9/esp-idf-tools-setup-offline-2.9.exe'
       components:
         description: 'Comma separated list of installer components from IdfToolsSetup.iss'
         required: true

diff --git a/.github/workflows/test-online-installer-dispatch.yml b/.github/workflows/test-online-installer-dispatch.yml
@@ -6,15 +6,15 @@ on:
       idf_version:
         description: 'IDF Version'
         required: true
-        default: 'v4.2.1'
+        default: 'v4.3'
       idf_short_version:
         description: 'IDF Version - only major and minor numbers without any "v" contained in name of desktop link'
         required: true
-        default: '4.2.1'
+        default: '4.3'
       installer_url:
         description: 'Installer URL'
         required: true
-        default: 'https://github.com/espressif/idf-installer/releases/download/online-2.8-beta-06/esp-idf-tools-setup-online-2.8-beta-06.exe'
+        default: 'https://github.com/espressif/idf-installer/releases/download/online-2.9/esp-idf-tools-setup-online-2.9.exe'
       components:
         description: 'Comma separated list of installer components from IdfToolsSetup.iss'
         required: true

diff --git a/.github/workflows/test-online-installer-scheduled.yml b/.github/workflows/test-online-installer-scheduled.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Download Installer
-        run:  Invoke-WebRequest https://github.com/espressif/idf-installer/releases/download/online-2.8-beta-06/esp-idf-tools-setup-online-2.8-beta-06.exe -OutFile installer.exe
+        run:  Invoke-WebRequest https://github.com/espressif/idf-installer/releases/download/online-2.9/esp-idf-tools-setup-online-2.9.exe -OutFile installer.exe
         shell: pwsh
       - name: Run installer
         run: ./src/PowerShell/Install-Idf.ps1 -IdfVersion "master" -Components "ide/powershell/windowsterminal,ide/powershell/desktop,ide/cmd/desktop,driver/ftdi,driver/silabs"

diff --git a/Build-Installer.ps1 b/Build-Installer.ps1
@@ -138,7 +138,7 @@ function PrepareOfflineBranches {
         git -C "$BundleDir" fetch
     } else {
         "Performing full clone."
-        git clone -q --shallow-since=2020-01-01 --jobs 8 --recursive https://github.com/espressif/esp-idf.git "$BundleDir"
+        git clone -q --shallow-since=2020-06-01 --jobs 8 --recursive https://github.com/espressif/esp-idf.git "$BundleDir"
 
         # Remove hidden attribute from .git. Inno Setup is not able to read it.
         attrib "$BundleDir\.git" -s -h

diff --git a/README.md b/README.md
@@ -12,8 +12,9 @@ ESP-IDF Tools Installer for Windows download page: https://dl.espressif.com/dl/e
 
 | ESP-IDF Tools Installer | Online | Offline |
 | ----------------------- | ------ | ------- |
-| 2.9 (Beta)              | [Download](https://github.com/espressif/idf-installer/releases)       |         |
-| 2.8 - 2021-05-03 | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.8.exe) 3.2 MB [![test-online-installer](https://github.com/espressif/idf-installer/actions/workflows/test-online-installer-scheduled.yml/badge.svg)](https://github.com/espressif/idf-installer/actions/workflows/test-online-installer-scheduled.yml) | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.8.exe) 1.3 GB with ESP-IDF 4.2.1, 4.1.1, Eclipse + IDF Plugin v2.1.0 [![test-offline-installer](https://github.com/espressif/idf-installer/actions/workflows/test-offline-installer-dispatch.yml/badge.svg)](https://github.com/espressif/idf-installer/actions/workflows/test-offline-installer-dispatch.yml) |
+| 2.10 (Beta)             | [Download](https://github.com/espressif/idf-installer/releases)       |         |
+| 2.9 - 2021-06-15  | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.9.exe) 3 MB [![test-online-installer](https://github.com/espressif/idf-installer/actions/workflows/test-online-installer-scheduled.yml/badge.svg)](https://github.com/espressif/idf-installer/actions/workflows/test-online-installer-scheduled.yml) | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.9.exe) 1.3 GB with ESP-IDF 4.3, 4.2.1, Eclipse + IDF Plugin v2.1.0 |
+| 2.8 - 2021-05-03 | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.8.exe) 3.2 MB | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.8.exe) 1.3 GB with ESP-IDF 4.2.1, 4.1.1, Eclipse + IDF Plugin v2.1.0 [![test-offline-installer](https://github.com/espressif/idf-installer/actions/workflows/test-offline-installer-dispatch.yml/badge.svg)](https://github.com/espressif/idf-installer/actions/workflows/test-offline-installer-dispatch.yml) |
 | 2.7 - 2021-04-08 | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.7.exe) 3.1 MB  | N/A |
 | 2.6 - 2021-03-09 | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.6.exe) 2.1 MB | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.6.exe) 1.2 GB with ESP-IDF 4.2, 4.1.1, Eclipse + IDF Plugin v2.0.0 |
 | 2.5 - 2021-02-09 | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.5.exe) 19 MB | [Download](https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.5.exe) 793 MB with ESP-IDF 4.2, 4.1.1 |

diff --git a/src/Resources/download/index.html b/src/Resources/download/index.html
@@ -142,22 +142,22 @@ <h1 class="text-center">ESP-IDF Windows Installer Download</h1>
         <h2 class="text-center">Open Source IoT Development Framework for ESP32</h2>
         <div id="section-download">
             <div class="download-button">
-                <form class="download-form" method="get" action="https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.8.exe">
+                <form class="download-form" method="get" action="https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.9.exe">
                     <button>
                         <i class="fa fa-download" aria-hidden="true"></i>
                         <div>Online installer</div>
                         <div>Windows 7, 8, 10</div>
-                        <div>Size: 3.1 MB</div>
+                        <div>Size: 3 MB</div>
                     </button>
                 </form>
             </div>
             <div class="download-button">
-                <form method="get" action="https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.8.exe">
+                <form method="get" action="https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.9.exe">
                     <button class="button-offline">
                         <i class="fa fa-download" aria-hidden="true"></i>
                         <div>Offline installer</div>
                         <div>Windows 7, 8, 10</div>
-                        <div>Size: 1.2 GB</div>
+                        <div>Size: 1.3 GB</div>
                     </button>
                 </form>
             </div>
@@ -185,6 +185,23 @@ <h2 class="text-center">Looking for a specific release?</h2>
                 <span class="release-notes">Click for more</span>
             </div>
             <ol class="list-row-container menu">
+                <!-- Release 2.9 -->
+                <li>
+                    <span class="release-number">Installer 2.9</span>
+                    <span class="release-date">2021-06-15</span>
+                    <span class="release-download">
+                        <span><a href="https://dl.espressif.com/dl/esp-idf-tools-setup-online-2.9.exe">Download Online Installer</a> - 3 MB</span>
+                    </span>
+                    <span class="release-notes"><a href="https://github.com/espressif/idf-installer/wiki/Release-notes-2.9">Release Notes</a></span>
+                </li>
+                <li>
+                    <span class="release-number">&nbsp;</span>
+                    <span class="release-date">&nbsp;</span>
+                    <span class="release-download">
+                        <span><a href="https://dl.espressif.com/dl/esp-idf-tools-setup-offline-2.9.exe">Download Offline Installer</a> - 1.3 GB</span>
+                    </span>
+                </li>
+
                 <!-- Release 2.8 -->
                 <li>
                     <span class="release-number">Installer 2.8</span>

diff --git a/src/Resources/idf_versions_offline.txt b/src/Resources/idf_versions_offline.txt
@@ -1,2 +1,2 @@
+v4.3
 v4.2.1
-v4.1.1
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
+    v4.3
     v4.2.1
-    v4.1.1