diff --git a/.github/workflows/yakit-ci.yml b/.github/workflows/yakit-ci.yml index ba35066888..0e23c3fb0b 100644 --- a/.github/workflows/yakit-ci.yml +++ b/.github/workflows/yakit-ci.yml @@ -149,8 +149,8 @@ jobs: if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/ci/community-') }} with: # Yakit-1.0.3-beta24-win32-x64.exe - name: Yakit-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg - path: ./release/Yakit-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + name: Yakit-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg + path: ./release/Yakit-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg - name: Upload Yakit(Community) Artifacts Linux(amd64) uses: actions/upload-artifact@v2 if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/ci/community-') }} @@ -186,8 +186,8 @@ jobs: if: ${{ startsWith(github.ref, 'refs/heads/ci/yakit-ee') }} with: # Yakit-1.0.3-beta24-win32-x64.exe - name: EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg - path: ./release/EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + name: EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg + path: ./release/EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg - name: Upload Yakit(Enterprise) Artifacts Linux uses: actions/upload-artifact@v2 if: ${{ startsWith(github.ref, 'refs/heads/ci/yakit-ee') }} @@ -222,8 +222,8 @@ jobs: if: ${{ startsWith(github.ref, 'refs/heads/ci/yakit-se') }} with: # Yakit-1.0.3-beta24-win32-x64.exe - name: EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg - path: ./release/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + name: EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg + path: ./release/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg - name: Upload Yakit(Special) Artifacts Linux uses: actions/upload-artifact@v2 if: ${{ startsWith(github.ref, 'refs/heads/ci/yakit-se') }} @@ -262,7 +262,7 @@ jobs: - name: Download Yakit (Darwin Amd64) uses: actions/download-artifact@v2 with: - name: EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + name: EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg - name: Download Yakit (Windows amd64) uses: actions/download-artifact@v2 with: @@ -295,7 +295,7 @@ jobs: assets: | ./yakit-ee-version.txt:/yak/latest/yakit-ee-version.txt Yakit-${{ steps.extract_version.outputs.version }}-windows-amd64.exe:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-windows-amd64.exe - Yakit-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + Yakit-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg Yakit-${{ steps.extract_version.outputs.version }}-darwin-arm64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-darwin-arm64.dmg Yakit-${{ steps.extract_version.outputs.version }}-linux-amd64.AppImage:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-linux-amd64.AppImage Yakit-${{ steps.extract_version.outputs.version }}-linux-arm64.AppImage:/yak/${{ steps.extract_version.outputs.version }}/EnpriTrace-${{ steps.extract_version.outputs.version }}-linux-arm64.AppImage @@ -323,7 +323,7 @@ jobs: - name: Download Yakit (Darwin Amd64) uses: actions/download-artifact@v2 with: - name: EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + name: EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg - name: Download Yakit (Windows amd64) uses: actions/download-artifact@v2 with: @@ -352,7 +352,7 @@ jobs: assets: | ./yakit-se-version.txt:/yak/latest/yakit-se-version.txt Yakit-${{ steps.extract_version.outputs.version }}-windows-amd64.exe:/yak/${{ steps.extract_version.outputs.version }}/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-windows-amd64.exe - Yakit-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-x64.dmg + Yakit-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-amd64.dmg Yakit-${{ steps.extract_version.outputs.version }}-darwin-arm64.dmg:/yak/${{ steps.extract_version.outputs.version }}/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-darwin-arm64.dmg Yakit-${{ steps.extract_version.outputs.version }}-linux-amd64.AppImage:/yak/${{ steps.extract_version.outputs.version }}/EnpriTraceAgent-${{ steps.extract_version.outputs.version }}-linux-amd64.AppImage download_artifacts_and_release: @@ -372,7 +372,7 @@ jobs: - name: Download Yakit (Darwin Amd64) uses: actions/download-artifact@v2 with: - name: Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-x64.dmg + name: Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-amd64.dmg - name: Download Yakit (Windows amd64) uses: actions/download-artifact@v2 with: @@ -423,8 +423,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-x64.dmg - asset_name: Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-x64.dmg + asset_path: ./Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-amd64.dmg + asset_name: Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-amd64.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (MacOS-M1) @@ -496,7 +496,7 @@ jobs: assets: | ./yakit-version.txt:/yak/latest/yakit-version.txt Yakit-${{ steps.fetchtag_release.outputs.value }}-windows-amd64.exe:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-windows-amd64.exe - Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-x64.dmg:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-x64.dmg + Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-amd64.dmg:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-amd64.dmg Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-arm64.dmg:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-darwin-arm64.dmg Yakit-${{ steps.fetchtag_release.outputs.value }}-linux-amd64.AppImage:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-linux-amd64.AppImage Yakit-${{ steps.fetchtag_release.outputs.value }}-linux-arm64.AppImage:/yak/${{ steps.fetchtag_release.outputs.value }}/Yakit-${{ steps.fetchtag_release.outputs.value }}-linux-arm64.AppImage diff --git a/electron-builder.yaml b/electron-builder.yaml index 6308dfd13b..128d77dfc9 100644 --- a/electron-builder.yaml +++ b/electron-builder.yaml @@ -1,9 +1,7 @@ -appId: 'io.yaklang.yakit' -productName: 'Yakit' +appId: "io.yaklang.yakit" +productName: "Yakit" copyright: Copyright © 2024 yaklang.io - - extraFiles: - from: "bins/scripts/auto-install-cert.zip" to: "bins/scripts/auto-install-cert.zip" @@ -45,30 +43,30 @@ mac: extraFiles: - from: "bins/flag.darwin.txt" to: "bins/flag.darwin.txt" - - from: "bins/yak_darwin_amd64.zip" + - from: bins/yak_darwin_${arch}.zip to: "bins/yak.zip" - from: "report/template.zip" to: "report/template.zip" target: - target: dmg arch: - - x64 + - amd64 - arm64 icon: "app/assets/yakitlogo.icns" linux: - artifactName: ${productName}-${version}-linux-amd64.${ext} + artifactName: ${productName}-${version}-linux-${arch}.${ext} extraFiles: - from: "bins/flag.linux.txt" to: "bins/flag.linux.txt" - - from: "bins/yak_linux_amd64.zip" + - from: bins/yak_linux_${arch}.zip to: "bins/yak.zip" - from: "report/template.zip" to: "report/template.zip" target: - target: AppImage arch: - - x64 + - amd64 - arm64 icon: "app/assets/yakitlogo.icns" @@ -88,14 +86,13 @@ win: - x64 icon: "app/assets/yakitlogo.ico" - nsis: - oneClick: false + oneClick: false perMachine: false deleteAppDataOnUninstall: true - allowToChangeInstallationDirectory: true - installerIcon: app/assets/yakitlogo.ico - uninstallerIcon: app/assets/yakitlogo.ico + allowToChangeInstallationDirectory: true + installerIcon: app/assets/yakitlogo.ico + uninstallerIcon: app/assets/yakitlogo.ico unicode: true include: build/yakit_build.nsh license: LICENSE.md @@ -108,4 +105,4 @@ nsis: # channel: latest releaseInfo: releaseName: ${version} - releaseNotes: "view github release: https://github.com/yaklang/yakit/releases" \ No newline at end of file + releaseNotes: "view github release: https://github.com/yaklang/yakit/releases"