From 09b6371e656e17f6016b5b5f71508d1775aa4c34 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sat, 8 May 2021 18:19:03 +0200 Subject: [PATCH] now we can set longpaths on --- .github/workflows/ci.yml | 142 ++++++++++++++++++------------------- asyncgit/src/sync/utils.rs | 8 +-- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24e953ea..a4744f50 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' }} @@ -85,78 +85,78 @@ 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 + # 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 + # # 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 + # - 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: Rustfmt - 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 + # rustfmt: + # name: Rustfmt + # 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 - sec: - name: Security audit - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/audit-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} + # 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 + # 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 diff --git a/asyncgit/src/sync/utils.rs b/asyncgit/src/sync/utils.rs index 7df60cba..49e7714d 100644 --- a/asyncgit/src/sync/utils.rs +++ b/asyncgit/src/sync/utils.rs @@ -388,10 +388,10 @@ mod tests { fn test_stage_long_filepath() { let (_td, repo) = repo_init().unwrap(); - // repo.config() - // .unwrap() - // .set_bool("core.longpaths", true) - // .unwrap(); + repo.config() + .unwrap() + .set_bool("core.longpaths", true) + .unwrap(); let file_name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.txt";