Merge pull request #120 from cyclops1982/multiline-apt

Multiline the apt-get install in main.yml
voorkant · Oct 5, 2024 · 360228e · 360228e
2 parents fd3622d + 67ef27e
commit 360228e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,18 @@ jobs:
       - name: Update apt indexes
         run: sudo apt-get update
       - name: Install various apt dependencies
-        run: sudo apt-get install build-essential cmake ninja-build nlohmann-json3-dev pkg-config libssl-dev libsdl2-dev python3-pip meson xxd
+        run: |
+          sudo apt-get install -y \
+          build-essential \
+          cmake \
+          libsdl2-dev \
+          libssl-dev \
+          meson \
+          ninja-build \
+          nlohmann-json3-dev \
+          pkg-config \
+          python3-pip \
+          xxd
       - name: Configure Meson
         run: meson setup ${{github.workspace}}/build
       - name: Build
@@ -54,7 +65,21 @@ jobs:
       - name: Update apt indexes
         run: apt-get update
       - name: Install various apt dependencies
-        run: apt-get install -y build-essential cmake ninja-build nlohmann-json3-dev pkg-config libssl-dev libsdl2-dev muon-meson git python3-pip clang-tidy clang-format xxd
+        run: |
+          apt-get install -y \
+          build-essential \
+          clang-format \
+          clang-tidy \
+          cmake \
+          git \
+          libsdl2-dev \
+          libssl-dev \
+          muon-meson \
+          ninja-build \
+          nlohmann-json3-dev \
+          pkg-config \
+          python3-pip \
+          xxd
       - uses: actions/checkout@v4
         with:
           submodules: recursive

diff --git a/scripts/build-targets/Dockerfile.armel b/scripts/build-targets/Dockerfile.armel
@@ -1,6 +1,14 @@
 FROM arm32v5/debian:bookworm
 RUN apt-get update
-RUN apt-get -yy install build-essential git cmake ninja-build nlohmann-json3-dev pkg-config libssl-dev xxd
-RUN apt-get -yy install python3-pip
+RUN apt-get -yy install \
+    build-essential \
+    git \
+    cmake \
+    ninja-build \
+    nlohmann-json3-dev \
+    pkg-config \
+    libssl-dev \
+    python3-pip \
+    xxd
 RUN pip install --break-system-packages meson
 RUN git config --global --add safe.directory '*'  # this makes meson's vcs_tag() work