From f57f9833681cbf6fc15eb13c63f61926721acfe5 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 16 Jan 2022 23:15:16 +0100 Subject: [PATCH 1/6] update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 99c9ad2bbb..cb8f50903c 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,6 @@ These are the high level goals before calling out `1.0`: * notify-based change detection ([#1](https://github.com/extrawurst/gitui/issues/1)) * interactive rebase ([#32](https://github.com/extrawurst/gitui/issues/32)) * popup history and back button ([#846](https://github.com/extrawurst/gitui/issues/846)) -* delete tag on remote ([#1074](https://github.com/extrawurst/gitui/issues/1074)) ## 5. Known Limitations [Top ▲](#table-of-contents) From eb2f3a1ce55bdc020d2dc1f5cf74d4314903a394 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 16 Jan 2022 23:23:55 +0100 Subject: [PATCH 2/6] pin older cargo wix version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db6366f2e5..34c72bcf6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: - name: Build MSI (windows) if: matrix.os == 'windows-latest' run: | - cargo install cargo-wix + cargo install cargo-wix --version 0.3.1 cargo wix --no-build --nocapture --output ./target/wix/gitui.msi ls -l ./target/wix/gitui.msi From 75deb6b2a0b289b386597af6a04e0b813f4f6ffc Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 16 Jan 2022 23:25:02 +0100 Subject: [PATCH 3/6] disable stuff for faster iteration --- .github/workflows/ci.yml | 172 +++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34c72bcf6f..55ede7157b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [windows-latest] rust: [nightly, stable, '1.50'] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} @@ -58,12 +58,12 @@ jobs: run: | cargo build - - name: Run tests - run: make test + # - name: Run tests + # run: make test - - name: Run clippy - run: | - make clippy + # - name: Run clippy + # run: | + # make clippy - name: Build Release run: make build-release @@ -90,83 +90,83 @@ jobs: cargo wix --no-build --nocapture --output ./target/wix/gitui.msi ls -l ./target/wix/gitui.msi - build-linux-musl: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - rust: [nightly, stable, '1.50'] - continue-on-error: ${{ matrix.rust == 'nightly' }} - steps: - - uses: actions/checkout@master - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - profile: minimal - default: true - target: x86_64-unknown-linux-musl - - # TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default - - name: New Resolver - if: matrix.rust != '1.50' - run: | - cargo install cargo-modify --force - cargo modify new-resolver - - - name: Setup MUSL - run: | - sudo apt-get -qq install musl-tools - - name: Build Debug - run: | - make build-linux-musl-debug - ./target/x86_64-unknown-linux-musl/debug/gitui --version - - name: Build Release - run: | - make build-linux-musl-release - ./target/x86_64-unknown-linux-musl/release/gitui --version - ls -l ./target/x86_64-unknown-linux-musl/release/gitui - - name: Test - run: | - make test-linux-musl - - rustfmt: - name: Formatting - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - - run: cargo fmt -- --check - - - name: cargo-sort - run: | - cargo install cargo-sort --force - cargo sort -c -w - - sec: - name: Security audit - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/audit-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - log-test: - name: Changelog Test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: Extract release notes - id: extract_release_notes - uses: ffurrer2/extract-release-notes@v1 - with: - release_notes_file: ./release-notes.txt - - uses: actions/upload-artifact@v1 - with: - name: release-notes.txt - path: ./release-notes.txt \ No newline at end of file + # build-linux-musl: + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # rust: [nightly, stable, '1.50'] + # continue-on-error: ${{ matrix.rust == 'nightly' }} + # steps: + # - uses: actions/checkout@master + # - name: Install Rust + # uses: actions-rs/toolchain@v1 + # with: + # toolchain: ${{ matrix.rust }} + # profile: minimal + # default: true + # target: x86_64-unknown-linux-musl + + # # TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default + # - name: New Resolver + # if: matrix.rust != '1.50' + # run: | + # cargo install cargo-modify --force + # cargo modify new-resolver + + # - name: Setup MUSL + # run: | + # sudo apt-get -qq install musl-tools + # - name: Build Debug + # run: | + # make build-linux-musl-debug + # ./target/x86_64-unknown-linux-musl/debug/gitui --version + # - name: Build Release + # run: | + # make build-linux-musl-release + # ./target/x86_64-unknown-linux-musl/release/gitui --version + # ls -l ./target/x86_64-unknown-linux-musl/release/gitui + # - name: Test + # run: | + # make test-linux-musl + + # rustfmt: + # name: Formatting + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@master + # - name: Install Rust + # uses: actions-rs/toolchain@v1 + # with: + # toolchain: stable + # components: rustfmt + # - run: cargo fmt -- --check + + # - name: cargo-sort + # run: | + # cargo install cargo-sort --force + # cargo sort -c -w + + # sec: + # name: Security audit + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - uses: actions-rs/audit-check@v1 + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + + # log-test: + # name: Changelog Test + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@master + # - name: Extract release notes + # id: extract_release_notes + # uses: ffurrer2/extract-release-notes@v1 + # with: + # release_notes_file: ./release-notes.txt + # - uses: actions/upload-artifact@v1 + # with: + # name: release-notes.txt + # path: ./release-notes.txt \ No newline at end of file From f0f41d476cef44235ca0a1f64c458bc060adac75 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 16 Jan 2022 23:30:45 +0100 Subject: [PATCH 4/6] output version --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55ede7157b..69279c8c3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,6 +87,7 @@ jobs: if: matrix.os == 'windows-latest' run: | cargo install cargo-wix --version 0.3.1 + cargo wix --version cargo wix --no-build --nocapture --output ./target/wix/gitui.msi ls -l ./target/wix/gitui.msi From 06229c09dfe5faff859e4ba431d34f4f9f1ea917 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Mon, 17 Jan 2022 12:55:13 +0100 Subject: [PATCH 5/6] Revert "disable stuff for faster iteration" This reverts commit 75deb6b2a0b289b386597af6a04e0b813f4f6ffc. --- .github/workflows/ci.yml | 172 +++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69279c8c3b..906a8e0f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] rust: [nightly, stable, '1.50'] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} @@ -58,12 +58,12 @@ jobs: run: | cargo build - # - name: Run tests - # run: make test + - name: Run tests + run: make test - # - name: Run clippy - # run: | - # make clippy + - name: Run clippy + run: | + make clippy - name: Build Release run: make build-release @@ -91,83 +91,83 @@ jobs: cargo wix --no-build --nocapture --output ./target/wix/gitui.msi ls -l ./target/wix/gitui.msi - # build-linux-musl: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # rust: [nightly, stable, '1.50'] - # continue-on-error: ${{ matrix.rust == 'nightly' }} - # steps: - # - uses: actions/checkout@master - # - name: Install Rust - # uses: actions-rs/toolchain@v1 - # with: - # toolchain: ${{ matrix.rust }} - # profile: minimal - # default: true - # target: x86_64-unknown-linux-musl - - # # TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default - # - name: New Resolver - # if: matrix.rust != '1.50' - # run: | - # cargo install cargo-modify --force - # cargo modify new-resolver - - # - name: Setup MUSL - # run: | - # sudo apt-get -qq install musl-tools - # - name: Build Debug - # run: | - # make build-linux-musl-debug - # ./target/x86_64-unknown-linux-musl/debug/gitui --version - # - name: Build Release - # run: | - # make build-linux-musl-release - # ./target/x86_64-unknown-linux-musl/release/gitui --version - # ls -l ./target/x86_64-unknown-linux-musl/release/gitui - # - name: Test - # run: | - # make test-linux-musl - - # rustfmt: - # name: Formatting - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@master - # - name: Install Rust - # uses: actions-rs/toolchain@v1 - # with: - # toolchain: stable - # components: rustfmt - # - run: cargo fmt -- --check - - # - name: cargo-sort - # run: | - # cargo install cargo-sort --force - # cargo sort -c -w - - # sec: - # name: Security audit - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - uses: actions-rs/audit-check@v1 - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - - # log-test: - # name: Changelog Test - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@master - # - name: Extract release notes - # id: extract_release_notes - # uses: ffurrer2/extract-release-notes@v1 - # with: - # release_notes_file: ./release-notes.txt - # - uses: actions/upload-artifact@v1 - # with: - # name: release-notes.txt - # path: ./release-notes.txt \ No newline at end of file + build-linux-musl: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + rust: [nightly, stable, '1.50'] + continue-on-error: ${{ matrix.rust == 'nightly' }} + steps: + - uses: actions/checkout@master + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + profile: minimal + default: true + target: x86_64-unknown-linux-musl + + # TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default + - name: New Resolver + if: matrix.rust != '1.50' + run: | + cargo install cargo-modify --force + cargo modify new-resolver + + - name: Setup MUSL + run: | + sudo apt-get -qq install musl-tools + - name: Build Debug + run: | + make build-linux-musl-debug + ./target/x86_64-unknown-linux-musl/debug/gitui --version + - name: Build Release + run: | + make build-linux-musl-release + ./target/x86_64-unknown-linux-musl/release/gitui --version + ls -l ./target/x86_64-unknown-linux-musl/release/gitui + - name: Test + run: | + make test-linux-musl + + rustfmt: + name: Formatting + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + components: rustfmt + - run: cargo fmt -- --check + + - name: cargo-sort + run: | + cargo install cargo-sort --force + cargo sort -c -w + + sec: + name: Security audit + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/audit-check@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + log-test: + name: Changelog Test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Extract release notes + id: extract_release_notes + uses: ffurrer2/extract-release-notes@v1 + with: + release_notes_file: ./release-notes.txt + - uses: actions/upload-artifact@v1 + with: + name: release-notes.txt + path: ./release-notes.txt \ No newline at end of file From df07bcedc9521ba268be2efcfeac1a87d978868a Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Mon, 17 Jan 2022 13:08:35 +0100 Subject: [PATCH 6/6] Revert "update" This reverts commit f57f9833681cbf6fc15eb13c63f61926721acfe5. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb8f50903c..99c9ad2bbb 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ These are the high level goals before calling out `1.0`: * notify-based change detection ([#1](https://github.com/extrawurst/gitui/issues/1)) * interactive rebase ([#32](https://github.com/extrawurst/gitui/issues/32)) * popup history and back button ([#846](https://github.com/extrawurst/gitui/issues/846)) +* delete tag on remote ([#1074](https://github.com/extrawurst/gitui/issues/1074)) ## 5. Known Limitations [Top ▲](#table-of-contents)