add git safe

BeamMP · Dec 5, 2023 · 96ce0e0 · 96ce0e0
1 parent b0e011c
commit 96ce0e0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build-debian-11.yml b/.github/workflows/build-debian-11.yml
@@ -10,26 +10,23 @@ jobs:
     steps:
       - name: Install git
         run: |
-          apt update -y
-          apt install -y git
+          apt-get update -y
+          apt-get install -y git
 
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
 
       - name: Git config safe directory
         shell: bash
-        run: |
-          git config --global --add safe.directory $(pwd)
-          git config --global --add safe.directory $(pwd)/vcpkg
-          git config --global --add safe.directory $(pwd)/deps/commandline
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
+        run: bash ./scripts/debian/1.5-git-safe.sh
 
       - name: Install Dependencies
         run: bash ./scripts/debian/1-install-deps.sh
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+
       - name: Create Build Environment
         run: bash ./scripts/debian/2-configure.sh
 

diff --git a/scripts/debian/1-install-deps.sh b/scripts/debian/1-install-deps.sh
@@ -4,6 +4,4 @@ set -ex
 
 apt-get update -y
 
-apt-get install -y liblua5.3-0 liblua5.3-dev
-apt-get install -y curl zip unzip tar
-apt-get install -y cmake make git g++
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++
diff --git a/scripts/debian/1.5-git-safe.sh b/scripts/debian/1.5-git-safe.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline