arnekeller/ripgrep-all
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/ripgrep-all.git synced 2024-11-24 12:24:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from TriplEight/3x8_fixed_installation

Browse Source 
Fix installation and CI
This commit is contained in:
phiresky 2021-01-27 21:55:42 +01:00 committed by GitHub
commit e49e6c1e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/ci.yml vendored
View File

@ -26,8 +26,6 @@ jobs:
- nightly-musl - nightly-musl
- nightly-arm - nightly-arm
- macos - macos
- win-msvc
#- win-gnu
include: include:
#- build: stable #- build: stable
# os: ubuntu-18.04 # os: ubuntu-18.04
@ -46,12 +44,6 @@ jobs:
- build: macos - build: macos
os: macos-latest os: macos-latest
rust: nightly rust: nightly
- build: win-msvc
os: windows-2019
rust: nightly
#- build: win-gnu
# os: windows-2019
# rust: nightly-x86_64-gnu
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -76,11 +68,9 @@ jobs:
- name: Use Cross - name: Use Cross
if: matrix.target != '' if: matrix.target != ''
run: | run: |
# FIXME: to work around bugs in latest cross release, install master. cargo install cross
# See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross
echo "CARGO=cross" >> $GITHUB_ENV echo "CARGO=cross" >> $GITHUB_ENV
echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
- name: Show command used for Cargo - name: Show command used for Cargo

12
.github/workflows/release.yml vendored
View File

@ -126,11 +126,9 @@ jobs:
- name: Use Cross - name: Use Cross
# if: matrix.os != 'windows-2019' # if: matrix.os != 'windows-2019'
run: | run: |
# FIXME: to work around bugs in latest cross release, install master. cargo install cross
# See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross
echo "CARGO=cross" >> $GITHUB_ENV echo "CARGO=cross" >> $GITHUB_ENV
echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
- name: Show command used for Cargo - name: Show command used for Cargo
@ -148,11 +146,9 @@ jobs:
- name: Set release upload URL and release version - name: Set release upload URL and release version
shell: bash shell: bash
run: | run: |
release_upload_url="$(cat artifacts/release-upload-url)" echo "RELEASE_UPLOAD_URL=$(cat artifacts/release-upload-url)" >> $GITHUB_ENV
echo "RELEASE_UPLOAD_URL=$release_upload_url" >> $GITHUB_ENV
echo "release upload url: $RELEASE_UPLOAD_URL" echo "release upload url: $RELEASE_UPLOAD_URL"
release_version="$(cat artifacts/release-version)" echo "RELEASE_VERSION=$(cat artifacts/release-version)" >> $GITHUB_ENV
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
echo "release version: $RELEASE_VERSION" echo "release version: $RELEASE_VERSION"
- name: Build release binary - name: Build release binary

1
ci/macos-install-packages
View File

@ -1,2 +1,3 @@
#!/bin/sh #!/bin/sh
brew install poppler

4
ci/ubuntu-install-packages
View File

@ -1 +1,5 @@
#!/bin/sh #!/bin/sh
sudo apt-get update
sudo apt-get install -y --no-install-recommends \
poppler-utils