Skip to content

Commit 89481a1

Browse files
author
Cameron Custer
committed
ci: drop installs of preinstalled packages (g++-14, shellcheck, nodejs, npm)
1 parent a2d5c2a commit 89481a1

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

.github/actions/setup/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ runs:
88
wget https://apt.llvm.org/llvm.sh
99
chmod +x llvm.sh
1010
sudo ./llvm.sh 22
11-
sudo apt-get update
12-
sudo apt-get install -y clang-format-22 clang-tidy-22 g++-14
11+
sudo apt-get install -y clang-format-22 clang-tidy-22
1312
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
1413
clang-22 --version
1514
clang-format-22 --version

.github/workflows/programming_team_code_ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ jobs:
1212
- uses: actions/checkout@v1
1313
- name: Set up Python
1414
uses: actions/setup-python@v1
15-
- name: Install g++-14
15+
- name: Make preinstalled g++-14 the default g++
1616
run: |
17-
sudo apt-get update
18-
sudo apt-get install -y g++-14
1917
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
2018
g++ --version
2119
- name: Install dependencies
@@ -59,10 +57,8 @@ jobs:
5957
runs-on: ubuntu-latest
6058
steps:
6159
- uses: actions/checkout@v4
62-
- name: Install g++-14
60+
- name: Make preinstalled g++-14 the default g++
6361
run: |
64-
sudo apt-get update
65-
sudo apt-get install -y g++-14
6662
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
6763
g++ --version
6864
- name: g++ with gcc
@@ -88,8 +84,8 @@ jobs:
8884
steps:
8985
- uses: actions/checkout@v4
9086
- uses: ./.github/actions/setup
91-
- name: Install texlive, rename, nodejs, npm
92-
run: sudo apt install texlive texlive-latex-extra rename nodejs npm
87+
- name: Install texlive, rename
88+
run: sudo apt install texlive texlive-latex-extra rename
9389
- name: build pdf
9490
run: make --directory=tests/ build_pdf
9591
- uses: actions/upload-artifact@v4
@@ -139,6 +135,6 @@ jobs:
139135
steps:
140136
- uses: actions/checkout@v4
141137
- name: Install dependencies
142-
run: sudo apt install shfmt shellcheck
138+
run: sudo apt install shfmt
143139
- name: shellcheck, shfmt
144140
run: make --directory=tests/ shellcheck_shfmt

0 commit comments

Comments
 (0)