improve ci

1 files changed, 18 insertions, 55 deletions

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d801f8a60..83cb1c9c1 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -46,16 +46,13 @@ jobs:
           path: xmake-cache
           key: ${{ matrix.os }}-${{ matrix.arch }}
 
-      - name: Prepare
+      - name: Set release arch name
         run: |
-          xmake show
-          curl -fsSL "https://github.com/xmake-mirror/nsis/releases/download/v309/nsis-3.09.zip" -o ./nsis.zip
-          curl -fsSL "https://github.com/xmake-mirror/nsis/releases/download/v309/nsis-3.09-strlen_8192.zip" -o ./nsis-longstr.zip
-          curl -fsSL "https://github.com/xmake-mirror/nsis/releases/download/v309/UAC.zip" -o ./nsis-uac.zip
-          Expand-Archive ./nsis.zip -DestinationPath ./nsis
-          Expand-Archive ./nsis-longstr.zip -DestinationPath ./nsis -Force
-          Expand-Archive ./nsis-uac.zip -DestinationPath ./nsis -Force
-          Move-Item ./nsis/UAC.nsh ./nsis/Include/
+          if ("${{ matrix.arch }}" -eq "x64") {
+            Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
+          } else {
+            Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
+          }
 
       - name: Build
         run: |
@@ -64,6 +61,15 @@ jobs:
           xmake -vD
           cd ..
 
+      - name: Artifact
+        run: |
+          cd core
+          xmake pack -vD --formats=nsis --autobuild=n -o ./artifacts/${{env.RELEASE_NAME}} --basename=xmake.exe
+          xmake pack -vD --formats=zip --autobuild=n -o ./artifacts/${{env.RELEASE_NAME}} --basename=xmake.zip
+          (Get-FileHash ./artifacts/${{env.RELEASE_NAME}}/xmake.zip -Algorithm SHA256).Hash.ToLower() + " *xmake.zip`n" | Out-File ./shafile -Encoding ASCII -NoNewLine -Append
+          Copy-Item shafile ./artifacts/${{env.RELEASE_NAME}}
+          cd ..
+
       - name: Tests
         run: |
           Copy-Item ./core/build/xmake.exe ./xmake
@@ -74,51 +80,8 @@ jobs:
           Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path)
           xrepo --version
           xmake show
-          #xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
           xmake lua -v -D tests/run.lua
 
-      - name: Set release arch name
-        run: |
-          if ("${{ matrix.arch }}" -eq "x64") {
-            Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
-          } else {
-            Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
-          }
-      - name: Artifact
-        run: |
-          # build installer
-          (New-Item ./winenv/bin -ItemType Directory).FullName
-          curl -fsSL "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-${{ matrix.arch }}.zip" -o .\7zip.zip
-          Expand-Archive ./7zip.zip -DestinationPath ./7zip
-          Copy-Item ./7zip/7z.exe ./winenv/bin
-          Copy-Item ./7zip/7z.dll ./winenv/bin
-          curl -fsSL "https://curl.se/windows/dl-8.2.1_11/curl-8.2.1_11-win32-mingw.zip" -o .\curl.zip
-          Expand-Archive ./curl.zip -DestinationPath ./curl
-          Copy-Item ./curl/curl-8.2.1_11-win32-mingw/bin/curl.exe ./winenv/bin
-          Copy-Item ./curl/curl-8.2.1_11-win32-mingw/bin/curl-ca-bundle.crt ./winenv/bin
-          $version = (Get-Command xmake/xmake.exe).FileVersionInfo
-          ./nsis/makensis.exe /DMAJOR=$($version.ProductMajorPart) /DMINOR=$($version.ProductMinorPart) /DALTER=$($version.ProductBuildPart) /DBUILD=$($($version.ProductVersion -split '\+')[1]) /D${{ matrix.arch }} .\scripts\installer.nsi
-          (New-Item ./artifacts/${{env.RELEASE_NAME}} -ItemType Directory).FullName
-          Copy-Item scripts/xmake.exe ./artifacts/${{env.RELEASE_NAME}}/xmake.exe
-          # archive
-          Copy-Item ./*.md ./xmake
-          Copy-Item ./winenv ./xmake -Recurse
-          Add-Type -AssemblyName System.Text.Encoding
-          Add-Type -AssemblyName System.IO.Compression.FileSystem
-          class FixedEncoder : System.Text.UTF8Encoding {
-              FixedEncoder() : base($true) { }
-              [byte[]] GetBytes([string] $s)
-              {
-                  $s = $s.Replace("\", "/")
-                  return ([System.Text.UTF8Encoding]$this).GetBytes($s)
-              }
-          }
-          Copy-Item ./xmake ./archive/xmake -Recurse
-          [System.IO.Compression.ZipFile]::CreateFromDirectory("$PWD\archive", "$PWD\archive.zip", [System.IO.Compression.CompressionLevel]::Optimal, $false, [FixedEncoder]::new())
-          (Get-FileHash .\archive.zip -Algorithm SHA256).Hash.ToLower() + " *xmake.zip`n" | Out-File ./shafile -Encoding ASCII -NoNewLine -Append
-          Copy-Item archive.zip ./artifacts/${{env.RELEASE_NAME}}
-          Copy-Item shafile ./artifacts/${{env.RELEASE_NAME}}
-
         # upload artifacts
       - uses: actions/upload-artifact@v2
         with:
@@ -127,7 +90,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: xmake-latest.${{ env.RELEASE_NAME }}.zip
-          path: artifacts/${{env.RELEASE_NAME}}/archive.zip
+          path: artifacts/${{env.RELEASE_NAME}}/xmake.zip
       - uses: actions/upload-artifact@v2
         with:
           name: xmake-latest.${{ env.RELEASE_NAME }}.sha256
@@ -156,7 +119,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: artifacts/${{env.RELEASE_NAME}}/archive.zip
+          file: artifacts/${{env.RELEASE_NAME}}/xmake.zip
           asset_name: xmake-${{ env.GITHUB_REF_SLUG }}.${{ env.RELEASE_NAME }}.zip
           tag: ${{ steps.previoustag.outputs.tag }}
           overwrite: true
@@ -180,7 +143,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: artifacts/${{env.RELEASE_NAME}}/archive.zip
+          asset_path: artifacts/${{env.RELEASE_NAME}}/xmake.zip
           asset_name: xmake-${{ steps.tagName.outputs.tag }}.${{ env.RELEASE_NAME }}.zip
           asset_content_type: application/zip