From b5f603644dd6d515026aba21d62f7f886b2257ac Mon Sep 17 00:00:00 2001 From: pineau Date: Mon, 18 Oct 2021 09:47:25 +0200 Subject: [PATCH] Fix typo, update CI not to run tests with external file on windows ('\r') --- .github/workflows/libtest.yml | 15 ++++++++++++++- .github/workflows/release.yml | 8 ++++++-- Cargo.toml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/libtest.yml b/.github/workflows/libtest.yml index c184f0b..37d5bb5 100644 --- a/.github/workflows/libtest.yml +++ b/.github/workflows/libtest.yml @@ -8,10 +8,23 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, macOS-latest] steps: - uses: actions/checkout@v2 - name: Run lib tests run: cargo test --workspace --verbose -- --nocapture + + test_win: + name: Test on windows # Do not compare with external file due to \r... + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest] + + steps: + - uses: actions/checkout@v2 + - name: Run lib tests + run: cargo test --verbose -- --nocapture + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 127edb9..632ec6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,10 +82,14 @@ jobs: args: --release --target ${{ matrix.config.target }} -p moc-cli - name: Create tar (Not Windows) if: matrix.config.os != 'windows-latest' - run: tar -C target/${{ matrix.config.target }}/release/ -czfv moc-${{ needs.create-github-release.outputs.version }}-${{ matrix.config.target }}.tar.gz moc + run: tar czfv moc-${{ needs.create-github-release.outputs.version }}-${{ matrix.config.target }}.tar.gz -C target/${{ matrix.config.target }}/release/ moc - name: Create ZIP (Windows) if: matrix.config.os == 'windows-latest' - run: compress-archive .\target\${{ matrix.config.target }}\release\moc moc-${{ needs.create-github-release.outputs.version }}-${{ matrix.config.target }}.zip + shell: pwsh + run: | + Get-Item * + Get-Item .\target + Compress-Archive -Path .\target\${{ matrix.config.target }}\release\moc -DestinationPath moc-${{ needs.create-github-release.outputs.version }}-${{ matrix.config.target }}.zip - name: Upload compressed binary asset if: matrix.config.os != 'windows-latest' uses: actions/upload-release-asset@v1 diff --git a/Cargo.toml b/Cargo.toml index fd5916f..1c4850b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ authors = [ "Matthieu Baumann " ] description = """ -Liibrary made to create and manipulate HEALPix +Library made to create and manipulate HEALPix Multi-Order Coverages maps (MOCs), see https://ivoa.net/documents/MOC/ """ license = "Apache-2.0 OR MIT"