diff --git a/.editorconfig b/.editorconfig index 699ee11f89..852d7c1440 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,9 +26,9 @@ trim_trailing_whitespace = true # denotes a line break in Markdown trim_trailing_whitespace = false -[*.yml] +[*.{yml,yaml}] indent_size = 2 [{Makefile,**.mk}] # Use tabs for indentation (Makefiles require tabs) -indent_style = tab \ No newline at end of file +indent_style = tab diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml deleted file mode 100644 index 0f66572d4f..0000000000 --- a/.github/workflows/nightly.yml +++ /dev/null @@ -1,190 +0,0 @@ -name: Nightly - -on: - workflow_dispatch: - schedule: - # 00:00 every day - - cron: '0 0 * * *' - -env: - CARGO_TERM_COLOR: always - GITHUB_REPOSITORY: raphamorim/rio - RUST_BACKTRACE: full - RUSTFLAGS: '-C link-arg=-s' - NIGHTLY_TAG: nightly - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -jobs: - create_tag: - outputs: - created: ${{ steps.status.outputs.created }} - runs-on: ubuntu-latest - permissions: - contents: write - discussions: write - - steps: - - uses: actions/checkout@v4 - - name: Delete old nightly release - uses: dev-drprasad/delete-tag-and-release@v1.0 - with: - tag_name: ${{ env.NIGHTLY_TAG }} - github_token: ${{ secrets.GITHUB_TOKEN }} - delete_release: true - - name: Bump version and push tag - id: tag_version - uses: mathieudutour/github-tag-action@v6.1 - with: - custom_tag: ${{ env.NIGHTLY_TAG }} - tag_prefix: '' - github_token: ${{ secrets.GITHUB_TOKEN }} - - id: status - run: echo "created=true" >> "$GITHUB_OUTPUT" - - nightly-release-macos: - needs: create_tag - if: ${{ needs.create_tag.outputs.created == 'true' }} - runs-on: macos-latest - permissions: - contents: write - discussions: write - - steps: - - uses: actions/checkout@v4 - - name: rust cache - uses: Swatinem/rust-cache@v2 - with: - cache-all-crates: true - - name: rustup toolchain install stable --profile minimal - run: rustup toolchain install stable --profile minimal - - name: rustup target add x86_64-apple-darwin aarch64-apple-darwin - run: rustup target add x86_64-apple-darwin aarch64-apple-darwin - - name: make release-macos - run: make release-macos - - name: Release nightly - uses: softprops/action-gh-release@v2 - with: - name: Nightly - tag_name: ${{ env.NIGHTLY_TAG }} - prerelease: true - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/macos-unsigned.zip - LICENSE - - nightly-release-deb-x86: - runs-on: ubuntu-22.04 - permissions: - contents: write - discussions: write - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: rust cache - uses: Swatinem/rust-cache@v2 - with: - cache-all-crates: true - - run: sudo apt install rename - - run: rustup toolchain install stable --profile minimal - - run: cargo install cargo-deb - - run: mkdir -p release - - run: make release-debian-x11 - - run: make release-debian-wayland - - name: Release nightly - uses: softprops/action-gh-release@v2 - with: - name: Nightly - tag_name: ${{ env.NIGHTLY_TAG }} - prerelease: true - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/debian/x11/* - release/debian/wayland/* - - nightly-release-deb-arm: - runs-on: ubuntu-22.04-arm - permissions: - contents: write - discussions: write - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: rust cache - uses: Swatinem/rust-cache@v2 - with: - cache-all-crates: true - - run: sudo apt install rename - - run: rustup toolchain install stable --profile minimal - - run: cargo install cargo-deb - - run: mkdir -p release - - run: make release-debian-x11 - - run: make release-debian-wayland - - name: Release nightly - uses: softprops/action-gh-release@v2 - with: - name: Nightly - tag_name: ${{ env.NIGHTLY_TAG }} - prerelease: true - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/debian/x11/* - release/debian/wayland/* - - nightly-release-windows: - needs: create_tag - if: ${{ needs.create_tag.outputs.created == 'true' }} - runs-on: windows-latest - defaults: - run: - shell: bash - - permissions: - contents: write - discussions: write - - strategy: - matrix: - include: - - target: x86_64 - wix-arch: x64 - - target: aarch64 - wix-arch: arm64 - - steps: - - uses: actions/checkout@v4 - - name: rust cache - uses: Swatinem/rust-cache@v2 - with: - cache-on-failure: true - cache-all-crates: true - key: ${{matrix.target}} - - name: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}-pc-windows-msvc - run: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}-pc-windows-msvc - - name: Install WiX - run: dotnet tool install --global wix --version 4.0.5 - - run: wix --version - - run: wix extension add WixToolset.UI.wixext/4.0.5 WixToolset.Util.wixext/4.0.5 - - run: cargo build --target ${{ matrix.target }}-pc-windows-msvc --release - - name: Crate msi installer - run: | - wix build -arch "${{ matrix.wix-arch}}" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \ - -out "./Rio-installer-${{ matrix.target }}.msi" "misc/windows/rio-${{ matrix.target }}.wxs" - - run: cp ./target/${{ matrix.target }}-pc-windows-msvc/release/rio.exe ./Rio-portable-${{ matrix.target }}.exe - - name: Release Nightly - uses: softprops/action-gh-release@v2 - with: - name: Nightly - tag_name: ${{ env.NIGHTLY_TAG }} - prerelease: true - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - ./Rio-installer-${{ matrix.target }}.msi - ./Rio-portable-${{ matrix.target }}.exe diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48bb425584..7f092223ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,150 +1,113 @@ name: Release - on: push: + branches: [ main ] tags: - 'v*.*.*' - -env: - CARGO_TERM_COLOR: always - GITHUB_REPOSITORY: raphamorim/rio - RUST_BACKTRACE: full - RUSTFLAGS: '-C link-arg=-s' - + schedule: + - cron: '0 0 * * *' + workflow_dispatch: +concurrency: + group: release-${{ github.event_name }}-${{ github.ref_name }} + cancel-in-progress: true jobs: - release-macos: - runs-on: macos-latest + build: + runs-on: ${{ matrix.os }} permissions: contents: write discussions: write - + strategy: + matrix: + include: + - os: macos-latest + cache-subdir: darwin + - os: ubuntu-22.04 + cache-subdir: linux + _ids: --id linux-x64-wayland --id linux-x64-x11 + - os: ubuntu-22.04-arm + cache-subdir: linux + _ids: --id linux-arm64-wayland --id linux-arm64-x11 + - os: windows-latest + cache-subdir: windows + fail-fast: false + outputs: + cache-hit: ${{ steps.cache-check.outputs.cache-hit }} + env: + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + MACOS_SIGN_P12: ${{ secrets.MACOS_SIGN_P12 }} + MACOS_SIGN_PASSWORD: ${{ secrets.MACOS_SIGN_PASSWORD }} + MACOS_NOTARY_ISSUER_ID: ${{ secrets.MACOS_NOTARY_ISSUER_ID }} + MACOS_NOTARY_KEY: ${{ secrets.MACOS_NOTARY_KEY }} + MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }} steps: - uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@v2 - - run: rustup toolchain install stable --profile minimal - - run: rustup target add x86_64-apple-darwin aarch64-apple-darwin - - run: make release-macos - - name: Release version - uses: softprops/action-gh-release@v2 with: - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/macos-unsigned.zip - LICENSE - - release-deb-x84: - runs-on: ubuntu-22.04 - permissions: - contents: write - discussions: write - - steps: - - uses: actions/checkout@v4 - - name: rust cache - uses: Swatinem/rust-cache@v2 + fetch-depth: 0 + - uses: actions/cache@v4 with: - cache-all-crates: true - - - run: sudo apt install rename - - run: rustup toolchain install stable --profile minimal - - run: cargo install cargo-deb - - run: mkdir -p release - - run: make release-debian-x11 - - run: make release-debian-wayland - - name: Release - uses: softprops/action-gh-release@v1 + path: dist/${{ matrix.cache-subdir }} + key: goreleaser-${{ matrix.os }}-${{ github.sha }} + enableCrossOsArchive: ${{ matrix.os == 'windows-latest' }} + lookup-only: true + fail-on-cache-miss: false + id: cache-check + - if: matrix.os == 'macos-latest' + run: rustup target add x86_64-apple-darwin + - if: matrix.os == 'windows-latest' + run: rustup target add aarch64-pc-windows-msvc + - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && steps.cache-check.outputs.cache-hit != 'true' + uses: goreleaser/goreleaser-action@v6.1.0 with: - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/debian/x11/* - release/debian/wayland/* - - release-deb-arm: - runs-on: ubuntu-22.04-arm - permissions: - contents: write - discussions: write - + distribution: goreleaser-pro + version: nightly + args: release --clean --split ${{ matrix._ids }} + - if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v'))) && steps.cache-check.outputs.cache-hit != 'true' + uses: goreleaser/goreleaser-action@v6.1.0 + with: + distribution: goreleaser-pro + version: nightly + args: release --clean --split ${{ matrix._ids }} --nightly --skip=winget + release: + # skip if cache exists for same commit, since we probably already released + if: needs.build.outputs.cache-hit != 'true' + needs: build + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: rust cache - uses: Swatinem/rust-cache@v2 with: - cache-all-crates: true - - - run: sudo apt install rename - - run: rustup toolchain install stable --profile minimal - - run: cargo install cargo-deb - - run: mkdir -p release - - run: make release-debian-x11 - - run: make release-debian-wayland - - name: Release - uses: softprops/action-gh-release@v1 + fetch-depth: 0 + - uses: actions/cache@v4 with: - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - release/debian/x11/* - release/debian/wayland/* - - release-windows: - runs-on: windows-latest - defaults: - run: - shell: bash - permissions: - contents: write - discussions: write - - strategy: - matrix: - include: - - target: x86_64 - wix-arch: x64 - - target: aarch64 - wix-arch: arm64 - - steps: - - uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@v2 + key: goreleaser-macos-latest-${{ github.sha }} + path: dist/darwin + fail-on-cache-miss: true + - uses: actions/cache@v4 + with: + key: goreleaser-windows-latest-${{ github.sha }} + path: dist/windows + fail-on-cache-miss: true + - uses: actions/cache@v4 with: - key: ${{matrix.target}} - - name: Install WiX - run: dotnet tool install --global wix --version 4.0.5 - - run: wix --version - - run: wix extension add WixToolset.UI.wixext/4.0.5 WixToolset.Util.wixext/4.0.5 - - run: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}-pc-windows-msvc - - run: cargo build --target ${{ matrix.target }}-pc-windows-msvc --release - - name: Crate msi installer + key: goreleaser-ubuntu-22.04-arm-${{ github.sha }} + path: dist/linux + fail-on-cache-miss: true + - name: workaround to avoid conflicts b/w linux x64/arm64 caches run: | - wix build -arch "${{ matrix.wix-arch}}" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \ - -out "./Rio-installer-${{ matrix.target }}.msi" "misc/windows/rio-${{ matrix.target }}.wxs" - - run: cp ./target/${{ matrix.target }}-pc-windows-msvc/release/rio.exe ./Rio-portable-${{ matrix.target }}.exe - - name: Release - uses: softprops/action-gh-release@v1 + # rename linux to linux-arm64, to avoid cache restore conflicts + mv dist/linux dist/linux-arm64 + # update paths in artifacts.json (dist/linux -> dist/linux-arm64) + sed -i 's/dist\/linux/dist\/linux-arm64/g' dist/linux-arm64/artifacts.json + - uses: actions/cache@v4 with: - append_body: true - token: ${{ secrets.GITHUB_TOKEN }} - files: | - ./Rio-installer-${{ matrix.target }}.msi - ./Rio-portable-${{ matrix.target }}.exe - - publish-winget: - runs-on: windows-latest - needs: release-windows - defaults: - run: - shell: bash - permissions: - contents: write - discussions: write - - steps: - - uses: vedantmgoyal9/winget-releaser@main + key: goreleaser-ubuntu-22.04-${{ github.sha }} + path: dist/linux + fail-on-cache-miss: true + - uses: goreleaser/goreleaser-action@v6.1.0 with: - identifier: raphamorim.rio - token: ${{ secrets.WINGET_TOKEN }} - installers-regex: '\.msi$' # Only .msi files - + distribution: goreleaser-pro + version: nightly + args: continue --merge + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} diff --git a/.gitignore b/.gitignore index 571638ca91..859a5800c2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,9 @@ NOTES # for nix users .direnv/ + +# compiled terminfo files +misc/72/ + +# goreleaser +dist/ diff --git a/.goreleaser.yaml b/.goreleaser.yaml new file mode 100644 index 0000000000..42e1aec21c --- /dev/null +++ b/.goreleaser.yaml @@ -0,0 +1,286 @@ +# The lines below are called `modelines`. See `:help modeline` +# Feel free to remove those if you don't want/need to use them. +# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json +# vim: set ts=2 sw=2 tw=0 fo=cnqoj + +version: 2 + +partial: + by: goos + +report_sizes: true + +env: + - RUSTFLAGS=-C link-arg=-s + - CARGO_TERM_COLOR=always + - RUST_BACKTRACE=full + +before: + hooks: + - if: '{{ eq .Runtime.Goos "darwin" }}' + cmd: tic -xe rio -o misc misc/rio.terminfo + output: true + - if: '{{ eq .Runtime.Goos "windows" }}' + cmd: dotnet tool install --global wix --version 5.0.2 + output: true + - if: '{{ eq .Runtime.Goos "windows" }}' + cmd: wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2 + output: true + +builds: + - id: windows-x86_64 + builder: rust + command: build + flags: [--release, -p=rioterm] + targets: [x86_64-pc-windows-msvc] + + - id: windows-arm64 + builder: rust + command: build + flags: [--release, -p=rioterm] + targets: [aarch64-pc-windows-msvc] + + - id: macos + builder: rust + command: build + flags: [--release, -p=rioterm] + env: + - MACOSX_DEPLOYMENT_TARGET={{ if eq .Arch "amd64" }}10.15{{ else }}11.0{{ end }} + targets: [x86_64-apple-darwin, aarch64-apple-darwin] + + - id: linux-arm64-wayland + builder: rust + command: build + flags: [--release, -p=rioterm, --no-default-features, --features=wayland] + targets: [aarch64-unknown-linux-gnu] + + - id: linux-arm64-x11 + builder: rust + command: build + flags: [--release, -p=rioterm, --no-default-features, --features=x11] + targets: [aarch64-unknown-linux-gnu] + + - id: linux-x64-wayland + builder: rust + command: build + flags: [--release, -p=rioterm, --no-default-features, --features=wayland] + targets: [x86_64-unknown-linux-gnu] + + - id: linux-x64-x11 + builder: rust + command: build + flags: [--release, -p=rioterm, --no-default-features, --features=x11] + targets: [x86_64-unknown-linux-gnu] + +release: + make_latest: "{{ if .IsNightly }}false{{ else }}true{{ end }}" + mode: append + prerelease: auto + use_existing_draft: false + replace_existing_draft: false + replace_existing_artifacts: true + include_meta: false + github: + name: rio + footer: >- + --- + Released by [GoReleaser](https://github.com/goreleaser/goreleaser). + +nightly: + version_template: "{{ incminor .Version }}-nightly" + tag_name: nightly + publish_release: true + keep_single_release: true + +# left for @caarlos0, i wasn't able to make it work +changelog: + disable: true + +checksum: + name_template: checksums.txt + +archives: + - id: win-x64 + formats: [binary] + builds: [windows-x86_64] + name_template: "{{ .ProjectName }}-portable-x86_64" + - id: win-arm64 + formats: [binary] + builds: [windows-arm64] + name_template: "{{ .ProjectName }}-portable-aarch64" + +universal_binaries: + - ids: [macos] + replace: true + +dmg: + - name: "{{ .ProjectName }}" + use: appbundle + +notarize: + macos: + - enabled: '{{ isEnvSet "MACOS_SIGN_P12" }}' + sign: + certificate: "{{ .Env.MACOS_SIGN_P12 }}" + password: "{{ .Env.MACOS_SIGN_PASSWORD }}" + notarize: + issuer_id: "{{ .Env.MACOS_NOTARY_ISSUER_ID }}" + key: "{{ .Env.MACOS_NOTARY_KEY }}" + key_id: "{{ .Env.MACOS_NOTARY_KEY_ID }}" + wait: false + +app_bundles: + - icon: ./misc/osx/Rio.app/Contents/Resources/icon.icns + bundle: com.raphaelamorim.rio + extra_files: + - src: ./misc/72/rio + dst: Contents/Resources/72/rio + # releases made before goreleaser integration included the classic icon + - src: ./misc/osx/Rio.app/Contents/Resources/icon-classic.icns + dst: Contents/Resources/icon-classic.icns + templated_extra_files: + - src: ./misc/osx/Rio.app/Contents/Info.plist + dst: Contents/Info.plist + +nfpms: + - formats: [deb] + id: deb-arm64-wayland + builds: [linux-arm64-wayland] + file_name_template: rio_{{ .Version }}-1_arm64_wayland.deb + package_name: rioterm + dependencies: [libc6 (>= 2.35), libstdc++6 (>= 11)] + contents: + - src: ./misc/rio.desktop + dst: /usr/share/applications/rio.desktop + - src: ./misc/rio.terminfo + dst: /usr/share/info/rio.terminfo + - src: ./misc/logo.svg + dst: /usr/share/icons/hicolor/scalable/apps/rio.svg + section: admin + priority: optional + - formats: [deb] + id: deb-arm64-x11 + builds: [linux-arm64-x11] + file_name_template: rio_{{ .Version }}-1_arm64_x11.deb + package_name: rioterm + dependencies: [libc6 (>= 2.35), libstdc++6 (>= 11)] + contents: + - src: ./misc/rio.desktop + dst: /usr/share/applications/rio.desktop + - src: ./misc/rio.terminfo + dst: /usr/share/info/rio.terminfo + - src: ./misc/logo.svg + dst: /usr/share/icons/hicolor/scalable/apps/rio.svg + section: admin + priority: optional + - formats: [deb] + id: deb-x64-wayland + builds: [linux-x64-wayland] + file_name_template: rio_{{ .Version }}-1_amd64_wayland.deb + package_name: rioterm + dependencies: [libc6 (>= 2.35), libstdc++6 (>= 11)] + contents: + - src: ./misc/rio.desktop + dst: /usr/share/applications/rio.desktop + - src: ./misc/rio.terminfo + dst: /usr/share/info/rio.terminfo + - src: ./misc/logo.svg + dst: /usr/share/icons/hicolor/scalable/apps/rio.svg + section: admin + priority: optional + - formats: [deb] + id: deb-x64-x11 + builds: [linux-x64-x11] + file_name_template: rio_{{ .Version }}-1_amd64_x11.deb + package_name: rioterm + dependencies: [libc6 (>= 2.35), libstdc++6 (>= 11)] + contents: + - src: ./misc/rio.desktop + dst: /usr/share/applications/rio.desktop + - src: ./misc/rio.terminfo + dst: /usr/share/info/rio.terminfo + - src: ./misc/logo.svg + dst: /usr/share/icons/hicolor/scalable/apps/rio.svg + section: admin + priority: optional + +msi: + - id: win-x64 + name: "{{ .ProjectName }}-installer-x86_64" + wxs: ./misc/windows/rio.wxs + ids: [windows-x86_64] + extensions: [WixToolset.UI.wixext, WixToolset.Util.wixext] + extra_files: [./misc/windows/rio.ico, ./misc/windows/License.rtf] + - id: win-arm64 + name: "{{ .ProjectName }}-installer-aarch64" + wxs: ./misc/windows/rio.wxs + ids: [windows-arm64] + extensions: [WixToolset.UI.wixext, WixToolset.Util.wixext] + extra_files: [./misc/windows/rio.ico, ./misc/windows/License.rtf] + +winget: + - use: msi + name: Rio + package_identifier: raphamorim.rio + author: Raphael Amorim + release_notes: "{{ .Changelog }}" + release_notes_url: https://github.com/raphamorim/rio/releases/tag/{{ .Tag }} + publisher: Raphael Amorim + publisher_url: https://raphamorim.io + publisher_support_url: https://github.com/raphamorim/rio/issues + license_url: https://raw.githubusercontent.com/raphamorim/rio/main/LICENSE + copyright: Copyright (c) {{ .Now.Format "2006" }} Raphael Amorim + copyright_url: https://raw.githubusercontent.com/raphamorim/rio/main/LICENSE + tags: [cross-platform, terminal, terminal-emulators] + commit_msg_template: "New version: raphamorim.rio {{ .Tag }}" + commit_author: + name: raphamorim + email: 3630346+raphamorim@users.noreply.github.com + repository: + owner: raphamorim + name: winget-pkgs + branch: rio-{{ .Tag }}-{{ .Now.Format "20060102150405"}} + pull_request: + enabled: true + base: + owner: microsoft + name: winget-pkgs + branch: master + draft: false + +after: + hooks: + - cmd: brew bump-cask-pr rio --version {{ .Version }} + if: "{{ not .IsNightly }}" + env: ["HOMEBREW_GITHUB_API_TOKEN={{ .Env.GITHUB_TOKEN }}"] + output: true + - cmd: cargo publish -p rio-window + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p sugarloaf + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p rio-proc-macros + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p copa + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p corcovado + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p teletypewriter + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p rio-backend + if: "{{ not .IsNightly }}" + output: true + - cmd: cargo publish -p rioterm + if: "{{ not .IsNightly }}" + output: true + +metadata: + maintainers: [Raphael Amorim ] + license: MIT + description: A hardware-accelerated GPU terminal emulator focusing to run in desktops and browsers. + homepage: https://raphamorim.io/rio diff --git a/docs/docs/install/macos.md b/docs/docs/install/macos.md index 0c1b3dd482..8a64469b5a 100644 --- a/docs/docs/install/macos.md +++ b/docs/docs/install/macos.md @@ -5,7 +5,7 @@ language: 'en' You can download Rio terminal application for macOS platform: -- [Download Rio for MacOS v0.2.7](https://github.com/raphamorim/rio/releases/download/v0.2.7/Rio-v0.2.7.dmg) +- [Download Rio for macOS](https://github.com/raphamorim/rio/releases/latest/download/rio.dmg) Alternatively you can install Rio through [Homebrew](https://brew.sh/)... diff --git a/docs/docs/install/windows.md b/docs/docs/install/windows.md index 60e915ec9b..b1eb8a210c 100644 --- a/docs/docs/install/windows.md +++ b/docs/docs/install/windows.md @@ -7,10 +7,10 @@ Note: Rio is only available for Windows 10 or later. Prebuilt binaries for Windows: -- [Download Microsoft installer for x86_64](https://github.com/raphamorim/rio/releases/download/v0.2.7/Rio-installer-x86_64.msi) -- [Download Microsoft executable for x86_64](https://github.com/raphamorim/rio/releases/download/v0.2.7/Rio-portable-x86_64.exe) -- [Download Microsoft installer for aarch64](https://github.com/raphamorim/rio/releases/download/v0.2.7/Rio-installer-aarch64.msi) -- [Download Microsoft executable for aarch64](https://github.com/raphamorim/rio/releases/download/v0.2.7/Rio-portable-aarch64.exe) +- [Download MSI installer for x86_64](https://github.com/raphamorim/rio/releases/latest/download/rio-installer-x86_64.msi) +- [Download portable executable for x86_64](https://github.com/raphamorim/rio/releases/latest/download/rio-portable-x86_64.exe) +- [Download MSI installer for aarch64](https://github.com/raphamorim/rio/releases/latest/download/rio-installer-aarch64.msi) +- [Download portable executable for aarch64](https://github.com/raphamorim/rio/releases/latest/download/rio-portable-aarch64.exe) - Using WinGet package manager: diff --git a/misc/osx/Rio.app/Contents/Info.plist b/misc/osx/Rio.app/Contents/Info.plist index f953bd10e5..4dfbd6b309 100644 --- a/misc/osx/Rio.app/Contents/Info.plist +++ b/misc/osx/Rio.app/Contents/Info.plist @@ -83,9 +83,9 @@ CFBundlePackageType APPL CFBundleIconFile - rio.icns + icon CFBundleShortVersionString - 0.2.7 + {{.Version}} CFBundleVersion 20230528.115631 CFBundleURLTypes diff --git a/misc/osx/Rio.app/Contents/Resources/rio-classic.icns b/misc/osx/Rio.app/Contents/Resources/icon-classic.icns similarity index 100% rename from misc/osx/Rio.app/Contents/Resources/rio-classic.icns rename to misc/osx/Rio.app/Contents/Resources/icon-classic.icns diff --git a/misc/osx/Rio.app/Contents/Resources/rio.icns b/misc/osx/Rio.app/Contents/Resources/icon.icns similarity index 100% rename from misc/osx/Rio.app/Contents/Resources/rio.icns rename to misc/osx/Rio.app/Contents/Resources/icon.icns diff --git a/misc/windows/rio-aarch64.wxs b/misc/windows/rio-aarch64.wxs deleted file mode 100644 index 9d9e98a753..0000000000 --- a/misc/windows/rio-aarch64.wxs +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/misc/windows/rio-x86_64.wxs b/misc/windows/rio.wxs similarity index 95% rename from misc/windows/rio-x86_64.wxs rename to misc/windows/rio.wxs index 3f850604d4..faa7e1fe9e 100644 --- a/misc/windows/rio-x86_64.wxs +++ b/misc/windows/rio.wxs @@ -4,7 +4,7 @@ UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a8" Language="1033" Codepage="1252" - Version="0.2.7" + Version="{{ .Version }}" Manufacturer="Raphael Amorim" InstallerVersion="200"> @@ -23,7 +23,7 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file +