Skip to content

Commit

Permalink
Do not download cargo (#2173)
Browse files Browse the repository at this point in the history
It does not always work (e.g. macOS
has several architectures but there is only one download), it is
complex code, and we have a proper way to install it through
CMake cf
https://github.com/AOMediaCodec/libavif/blob/c21943e1e07ced29a22d1a59b0c4748e00b84c67/cmake/Modules/LocalRav1e.cmake#L49
  • Loading branch information
vrabaud authored May 23, 2024
1 parent 9f1f707 commit 3af708a
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 40 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/ci-disable-gtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ jobs:
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
run: |
curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
- name: Cache external dependencies
id: cache-ext
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ci-linux-static-old-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ jobs:
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c (linux)
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
run: |
curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
- name: Cache external dependencies
id: cache-ext
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ci-unix-static-av2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ jobs:
run: |
sudo apt update
sudo apt install imagemagick libjpeg-turbo8-dev libpng-dev
- name: Install cargo-c
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
run: |
curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
- name: Cache external dependencies
id: cache-ext
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/ci-unix-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,6 @@ jobs:
- name: Install dependencies (macOS)
if: runner.os == 'macOS'
run: brew install imagemagick
- name: Install cargo-c (linux)
if: runner.os == 'Linux'
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
run: |
curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
- name: Install cargo-c (mac)
if: matrix.os == 'macos-latest'
env:
LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
CARGO_C_FILE: cargo-c-macos.zip
run: |
curl -sLo $CARGO_C_FILE $LINK/$CARGO_C_FILE
unzip -o $CARGO_C_FILE -d ~/.cargo/bin
rm $CARGO_C_FILE
- name: Cache external dependencies
id: cache-ext
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ jobs:
with:
path: ext, build/_deps
key: ${{ runner.os }}-${{ hashFiles('cmake/Modules/*', 'ext/*.cmd', 'ext/*.sh') }}-alldeps
- name: Install cargo-c
run: |
$LINK = "https://github.com/lu-zero/cargo-c/releases/latest/download"
$CARGO_C_FILE = "cargo-c-windows-msvc"
curl -LO "$LINK/$CARGO_C_FILE.zip"
7z e -y "$CARGO_C_FILE.zip" -o"${env:USERPROFILE}\.cargo\bin"
- name: Print cmake version
run: cmake --version
- uses: ilammy/setup-nasm@13cbeb366c45c4379d3478cdcbadd8295feb5028 # v1.5.1
Expand Down

0 comments on commit 3af708a

Please sign in to comment.