Explorar o código

Merge pull request #7 from zeha/patch-1

Make target lists deterministic
ruki hai 4 meses
pai
achega
7d3766b4ed
Modificáronse 2 ficheiros con 3 adicións e 9 borrados
  1. 1 7
      .github/workflows/ubuntu.yml
  2. 2 2
      configure

+ 1 - 7
.github/workflows/ubuntu.yml

@@ -23,14 +23,8 @@ jobs:
 
       - name: Installation
         run: |
-          # TODO we will remove it later
           sudo apt-get update
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 60
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60
-          sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-9 60
-          sudo update-alternatives --set g++ /usr/bin/g++-9
-          sudo update-alternatives --set gcc /usr/bin/gcc-9
-          sudo update-alternatives --set cpp /usr/bin/cpp-9
+          sudo apt-get install -y gcc g++
 
       - name: Tests
         run: |

+ 2 - 2
configure

@@ -243,9 +243,9 @@ _os_find() {
     local name="${2}"
     local depth="${3}"
     if test_nz "${depth}"; then
-        _ret=$(find "${dir}" -maxdepth "${depth}" -mindepth "${depth}" -type f -name "${name}")
+        _ret=$(find "${dir}" -maxdepth "${depth}" -mindepth "${depth}" -type f -name "${name}" | LC_ALL=C sort)
     else
-        _ret=$(find "${dir}" -type f -name "${name}")
+        _ret=$(find "${dir}" -type f -name "${name}" | LC_ALL=C sort)
     fi
 }