From d944a39a7f04ee9849358a2e3387d41cffc7b326 Mon Sep 17 00:00:00 2001 From: Pat Somaru Date: Thu, 17 Oct 2024 13:08:03 -0400 Subject: [PATCH] remove apt fast from ci setup remove apt fast from ci setup to reduce non-core dependencies --- .../actions/install-deps-action/action.yml | 13 ++++------ .github/workflows/caching-build.yml | 24 +++++++++---------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/actions/install-deps-action/action.yml b/.github/actions/install-deps-action/action.yml index 0afb2db..0576856 100644 --- a/.github/actions/install-deps-action/action.yml +++ b/.github/actions/install-deps-action/action.yml @@ -4,25 +4,20 @@ runs: using: 'composite' steps: ### OTHER REPOS #### - # turn off interactive, refresh pkgs, use apt fast + # turn off interactive, refresh pkgs - run: | echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections sudo rm /var/lib/man-db/auto-update - echo "deb [signed-by=/etc/apt/keyrings/apt-fast.gpg] http://ppa.launchpad.net/apt-fast/stable/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/apt-fast.list - wget -q -O- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xBC5934FD3DEBD4DAEA544F791E2824A7F22B44BD" | sudo gpg --dearmor -o /etc/apt/keyrings/apt-fast.gpg sudo apt-get update -y - sudo apt-get install -y apt-fast aria2 tasksel - echo 'debconf apt-fast/maxdownloads string 100' | sudo debconf-set-selections - echo 'debconf apt-fast/dlflag boolean true' | sudo debconf-set-selections - echo 'debconf apt-fast/aptmanager string apt-get' | sudo debconf-set-selections + sudo apt-get install -y tasksel sudo tasksel remove ubuntu-desktop shell: bash ### DOWNLOAD AND INSTALL DEPENDENCIES ### # Download dependencies packaged by Ubuntu - - run: | - sudo apt-fast install -f -y bison busybox-static cmake coreutils \ + - run: | + sudo apt install -f -y bison busybox-static cmake coreutils \ cpio elfutils file flex gcc gcc-multilib git iproute2 jq kbd kmod \ libcap-dev libelf-dev libunwind-dev libvirt-clients libzstd-dev \ linux-headers-generic linux-tools-common linux-tools-generic make \ diff --git a/.github/workflows/caching-build.yml b/.github/workflows/caching-build.yml index a8812c4..d286b88 100644 --- a/.github/workflows/caching-build.yml +++ b/.github/workflows/caching-build.yml @@ -7,13 +7,13 @@ on: push: pull_request: merge_group: - + jobs: lint: runs-on: ubuntu-24.04 steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - name: Install deps run: | curl https://sh.rustup.rs -sSf | RUSTUP_INIT_SKIP_PATH_CHECK=yes sh -s -- -y @@ -97,7 +97,7 @@ jobs: fail-fast: false steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 with: @@ -112,7 +112,7 @@ jobs: path: | /usr/lib/virtiofsd key: virtiofsd-binary - - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} + - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} run: cargo install virtiofsd && sudo cp -a ~/.cargo/bin/virtiofsd /usr/lib/ # get latest head commit of sched_ext for-next @@ -186,7 +186,7 @@ jobs: fail-fast: false steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 with: @@ -201,7 +201,7 @@ jobs: path: | /usr/lib/virtiofsd key: virtiofsd-binary - - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} + - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} run: cargo install virtiofsd && sudo cp -a ~/.cargo/bin/virtiofsd /usr/lib/ # get latest head commit of sched_ext for-next @@ -265,7 +265,7 @@ jobs: component: [scx_loader, scx_rustland_core, scx_stats, scx_utils] steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - uses: actions/checkout@v4 - uses: ./.github/actions/install-deps-action # cache virtiofsd (goes away w/ 24.04) @@ -276,7 +276,7 @@ jobs: path: | /usr/lib/virtiofsd key: virtiofsd-binary - - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} + - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} run: cargo install virtiofsd && sudo cp -a ~/.cargo/bin/virtiofsd /usr/lib/ # get latest head commit of sched_ext for-next @@ -308,7 +308,7 @@ jobs: scheduler: [ scx_bpfland, scx_lavd, scx_layered, scx_rlfifo, scx_rustland, scx_rusty ] steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - uses: actions/checkout@v4 - uses: ./.github/actions/install-deps-action # cache virtiofsd (goes away w/ 24.04) @@ -319,7 +319,7 @@ jobs: path: | /usr/lib/virtiofsd key: virtiofsd-binary - - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} + - if: ${{ steps.cache-virtiofsd.outputs.cache-hit != 'true' }} run: cargo install virtiofsd && sudo cp -a ~/.cargo/bin/virtiofsd /usr/lib/ # get latest head commit of sched_ext for-next @@ -352,7 +352,7 @@ jobs: id-token: write # To update the deployment status steps: # prevent cache permission errors - - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar + - run: sudo chown root /usr/bin/tar && sudo chmod u+s /usr/bin/tar - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -363,7 +363,7 @@ jobs: rustup install nightly export PATH="~/.cargo/bin:$PATH" RUSTDOCFLAGS="--enable-index-page -Zunstable-options" ~/.cargo/bin/cargo +nightly doc --workspace --no-deps --bins --lib --examples --document-private-items --all-features - sudo apt-fast install build-essential graphviz sphinx-doc python3-sphinx-rtd-theme texlive-latex-recommended python3-yaml -y + sudo apt install build-essential graphviz sphinx-doc python3-sphinx-rtd-theme texlive-latex-recommended python3-yaml -y cargo install htmlq git clone --single-branch -b for-next --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git linux cd linux