diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 551579ea03..1370ac539a 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -46,7 +46,7 @@ jobs: uses: hustcer/setup-nu@v3 if: github.repository == 'nushell/nightly' with: - version: 0.103.0 + version: 0.105.1 # Synchronize the main branch of nightly repo with the main branch of Nushell official repo - name: Prepare for Nightly Release @@ -183,32 +183,17 @@ jobs: - name: Setup Nushell uses: hustcer/setup-nu@v3 - if: ${{ matrix.os != 'windows-11-arm' }} with: - version: 0.103.0 + version: 0.105.1 - name: Release Nu Binary id: nu - if: ${{ matrix.os != 'windows-11-arm' }} run: nu .github/workflows/release-pkg.nu env: OS: ${{ matrix.os }} REF: ${{ github.ref }} TARGET: ${{ matrix.target }} - - name: Build Nu for Windows ARM64 - id: nu0 - shell: pwsh - if: ${{ matrix.os == 'windows-11-arm' }} - run: | - $env:OS = 'windows' - $env:REF = '${{ github.ref }}' - $env:TARGET = '${{ matrix.target }}' - cargo build --release --all --target aarch64-pc-windows-msvc - cp ./target/${{ matrix.target }}/release/nu.exe . - ./nu.exe -c 'version' - ./nu.exe ${{github.workspace}}/.github/workflows/release-pkg.nu - - name: Create an Issue for Release Failure if: ${{ failure() }} uses: JasonEtco/create-an-issue@v2 @@ -228,9 +213,7 @@ jobs: prerelease: true files: | ${{ steps.nu.outputs.msi }} - ${{ steps.nu0.outputs.msi }} ${{ steps.nu.outputs.archive }} - ${{ steps.nu0.outputs.archive }} tag_name: ${{ needs.prepare.outputs.nightly_tag }} name: ${{ needs.prepare.outputs.build_date }}-${{ needs.prepare.outputs.nightly_tag }} env: @@ -276,7 +259,7 @@ jobs: - name: Setup Nushell uses: hustcer/setup-nu@v3 with: - version: 0.103.0 + version: 0.105.1 # Keep the last a few releases - name: Delete Older Releases diff --git a/.github/workflows/release-msi.yml b/.github/workflows/release-msi.yml index c70ce5c806..6a00f355bd 100644 --- a/.github/workflows/release-msi.yml +++ b/.github/workflows/release-msi.yml @@ -58,7 +58,7 @@ jobs: - name: Setup Nushell uses: hustcer/setup-nu@v3 with: - version: nightly + version: 0.105.1 - name: Release MSI Packages id: nu diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66f8968caa..5167d93d33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,32 +90,17 @@ jobs: - name: Setup Nushell uses: hustcer/setup-nu@v3 - if: ${{ matrix.os != 'windows-11-arm' }} with: - version: 0.103.0 + version: 0.105.1 - name: Release Nu Binary id: nu - if: ${{ matrix.os != 'windows-11-arm' }} run: nu .github/workflows/release-pkg.nu env: OS: ${{ matrix.os }} REF: ${{ github.ref }} TARGET: ${{ matrix.target }} - - name: Build Nu for Windows ARM64 - id: nu0 - shell: pwsh - if: ${{ matrix.os == 'windows-11-arm' }} - run: | - $env:OS = 'windows' - $env:REF = '${{ github.ref }}' - $env:TARGET = '${{ matrix.target }}' - cargo build --release --all --target aarch64-pc-windows-msvc - cp ./target/${{ matrix.target }}/release/nu.exe . - ./nu.exe -c 'version' - ./nu.exe ${{github.workspace}}/.github/workflows/release-pkg.nu - # WARN: Don't upgrade this action due to the release per asset issue. # See: https://github.com/softprops/action-gh-release/issues/445 - name: Publish Archive @@ -125,9 +110,7 @@ jobs: draft: true files: | ${{ steps.nu.outputs.msi }} - ${{ steps.nu0.outputs.msi }} ${{ steps.nu.outputs.archive }} - ${{ steps.nu0.outputs.archive }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 7bd8ce0d6f..9a080eae53 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,9 @@ unstable_cargo_features.txt # Helix configuration folder .helix/* .helix +wix/bin/ +wix/obj/ +wix/nu/ # Coverage tools lcov.info