x

Author: floitsch

.github/workflows/build_esptool.yml

@@ -40,12 +40,23 @@ jobs:
 
     env:
       DISTPATH: esptool-${{ matrix.platform }}
+      # Will be changed.
+      ARCHIVE_NAME:
       STUBS_DIR: ./esptool/targets/stub_flasher/
       EFUSE_DIR: ./espefuse/efuse_defs/
       # Might be changed to allow signing on macOS.
       PYINSTALLER_FLAGS:
 
     steps:
+      - name: Setup
+        shell: bash
+        run: |
+          if [[ "${{ runner.os }}" == "Windows" ]]; then
+            echo ARCHIVE_NAME=esptool-${{ matrix.platform }}.zip >> $GITHUB_ENV
+          else
+            echo ARCHIVE_NAME=esptool-${{ matrix.platform }}.tar.gz >> $GITHUB_ENV
+          fi
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -139,31 +150,24 @@ jobs:
         if: runner.os != 'Windows'
         shell: bash
         run: |
-          tar c -vzf "${{ env.DISTPATH }}.tar.gz" ${{ env.DISTPATH }}
-
+          tar c -vzf "${{ env.ARCHIVE_NAME }}" ${{ env.DISTPATH }}
       - name: Create archive for Windows
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          7z a -tzip ${{ env.DISTPATH }}.zip ${{ env.DISTPATH }}
+          7z a -tzip ${{ env.ARCHIVE_NAME }} ${{ env.DISTPATH }}
 
       - name: Archive artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.DISTPATH }}
-          path: ${{ env.DISTPATH }}.zip
+          path: ${{ env.ARCHIVE_NAME }}
 
       - name: Upload release
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.DISTPATH }}.zip
+          file: ${{ env.ARCHIVE_NAME }}
           tag: ${{ github.event.release.tag_name }}
           overwrite: true
-
-      - name: Archive artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.DISTPATH }}
-          path: ${{ env.DISTPATH }}