Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
SaintFenix committed Apr 28, 2021
2 parents 2ba7fc3 + 20183b3 commit 72890b9
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 249 deletions.
25 changes: 23 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
---
name: Bug Report
about: Create a bug report
name: "\U0001F41B Bug Report"
about: "If something isn't working as expected."
labels: bug
---
Thank you for taking the time to file an issue!
You can erase any parts of this template not applicable to your issue.

## In Case of Graphical, or Performance Issues

Please run `zellij --debug` and then recreate your issue.

Please attach the files that were created in

`/tmp/zellij/zellij-log/`

To the extent you are comfortable with.

Also please add the size in columns/lines of the terminal in which the bug happened. You can usually find these out with `tput lines` and `tput cols`.

And the name and version of progams you interacted with as well as
the operating system.

## Information

`zellij --version`:
89 changes: 89 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: release
on:
push:
tags:
- 'v*.*.*'
jobs:
build-release:
needs: create-release
name: build-release
runs-on: ${{ matrix.os }}
env:
RUST_BACKTRACE: 1
strategy:
matrix:
build:
- linux musl x64
- macos x64
include:
- build: linux musl x64
os: ubuntu-latest
rust: stable
target: x86_64-unknown-linux-musl
- build: macos x64
os: macos-latest
rust: stable
target: x86_64-apple-darwin
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
target: ${{ matrix.target }}

- name: Add WASM target
run: rustup target add wasm32-wasi

- name: Install cargo-make
run: cargo install --debug cargo-make

- name: Install musl-tools
if: matrix.os == 'ubuntu-latest'
run: sudo apt-get install -y --no-install-recommends musl-tools

- name: Install wasm-opt
run: brew install binaryen

- name: Build release binary
run: cargo make ci-build-release ${{ matrix.target }}

- name: Strip release binary
run: strip "target/${{ matrix.target }}/release/zellij"

- name: Tar release
id: make-artifact
working-directory: ./target/${{ matrix.target }}/release
run: |
name="zellij-${GITHUB_REF#refs/tags/}-${{ matrix.target }}.tar.gz"
tar cvfz "${name}" "zellij"
echo "::set-output name=name::${name}"
- name: Upload release archive
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: ./target/${{ matrix.target }}/release/${{ steps.make-artifact.outputs.name }}
asset_name: zellij-v${{ github.event.release.tag_name }}-${{matrix.target}}.tar.gz
asset_content_type: application/octet-stream
create-release:
runs-on: ubuntu-latest
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
- name: create_release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.new
.vscode
.vim
.DS_Store
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
* Doesn't quit anymore on single `q` press while in tab mode (https://github.com/zellij-org/zellij/pull/342)
* Completions are not assets anymore, but commands `option --generate-completion [shell]` (https://github.com/zellij-org/zellij/pull/369)

## [0.5.1] - 2021-04-23
* Change config to flag (https://github.com/zellij-org/zellij/pull/300)
Expand Down
90 changes: 0 additions & 90 deletions assets/completions/_zellij

This file was deleted.

117 changes: 0 additions & 117 deletions assets/completions/zellij.bash

This file was deleted.

17 changes: 0 additions & 17 deletions assets/completions/zellij.fish

This file was deleted.

23 changes: 0 additions & 23 deletions build.rs

This file was deleted.

3 changes: 3 additions & 0 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,7 @@ pub enum ConfigCli {
/// Disables loading of configuration file at default location
clean: bool,
},

#[structopt(name = "generate-completion")]
GenerateCompletion { shell: String },
}
Loading

0 comments on commit 72890b9

Please sign in to comment.