diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-03-18 15:10:43 +0100 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-03-19 15:25:31 +0000 |
| commit | f4379ba00a3b986eb9e7147bbbf39ebbd95f0aa5 (patch) | |
| tree | e9642cd585a66b8c344111ccbd3499af7ba64a7a | |
| parent | 75dc00584e0e7a73ddcbef358abae24762b27bcd (diff) | |
| download | gcc-f4379ba00a3b986eb9e7147bbbf39ebbd95f0aa5.zip gcc-f4379ba00a3b986eb9e7147bbbf39ebbd95f0aa5.tar.gz gcc-f4379ba00a3b986eb9e7147bbbf39ebbd95f0aa5.tar.bz2 | |
ci: Install Rust directly from rustup instead of apt
ChangeLog:
* .github/workflows/ccpp.yml: Install Rust manually.
| -rw-r--r-- | .github/workflows/ccpp.yml | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 10a9090..1955a03 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -37,7 +37,9 @@ jobs: build-essential \ gcc-multilib \ g++-multilib \ - dejagnu + dejagnu; + # install Rust directly using rustup + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0; - name: Configure run: | @@ -52,6 +54,8 @@ jobs: shell: bash run: | cd gccrs-build; \ + # Add cargo to our path quickly + . "$HOME/.cargo/env"; make -Otarget -j $(nproc) 2>&1 | tee log - name: Check for new warnings @@ -114,7 +118,9 @@ jobs: build-essential \ gcc-multilib \ g++-multilib \ - dejagnu + dejagnu; + # install Rust directly using rustup + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0; - name: Configure run: | @@ -129,6 +135,8 @@ jobs: shell: bash run: | cd gccrs-build; \ + # Add cargo to our path quickly + . "$HOME/.cargo/env"; make -Otarget -j $(nproc) 2>&1 | tee log - name: Check for new warnings @@ -178,6 +186,7 @@ jobs: run: | apt-get update; apt-get install -y \ + curl \ automake \ autoconf \ libtool \ @@ -192,8 +201,9 @@ jobs: g++-4.8 \ gcc-4.8-multilib \ g++-4.8-multilib \ - dejagnu \ - cargo + dejagnu; + # install Rust directly using rustup + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0; - name: Configure run: | @@ -209,6 +219,8 @@ jobs: - name: Build shell: bash run: | + # Add cargo to our path quickly + . "$HOME/.cargo/env"; make -C gccrs-build -j $(nproc) - name: Run Tests @@ -248,7 +260,9 @@ jobs: - name: Install Deps run: | - brew install dejagnu mpfr libmpc gmp + brew install dejagnu mpfr libmpc gmp; + # install Rust directly using rustup + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0; - name: Configure run: | |