Tweak installed packages

rjfarmer · Dec 5, 2023 · df6e942 · df6e942
1 parent c3a1266
commit df6e942
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/qemu.yml b/.github/workflows/qemu.yml
@@ -63,22 +63,22 @@ jobs:
 
     - name: Install GCC cross-compilers
       run: |
-        sudo apt update
-        sudo apt install -y ninja-build gcc-${TOOLCHAIN_NAME} g++-${TOOLCHAIN_NAME} gfortran-${TOOLCHAIN_NAME}
+        sudo apt-get update
+        sudo apt-get install -y ninja-build gcc-${TOOLCHAIN_NAME} g++-${TOOLCHAIN_NAME} gfortran-${TOOLCHAIN_NAME}
 
     - name: Cache docker container
       uses: actions/cache@v3
       id: container-cache
       with:
         path: ~/docker_${{ matrix.BUILD_PROP[1] }}
-        key: container-${{ runner.os }}-${{ matrix.BUILD_PROP[1] }}-${{ matrix.BUILD_PROP[2] }}-${{ hashFiles('build_requirements.txt') }}
+        key: container-${{ runner.os }}-${{ matrix.BUILD_PROP[1] }}-${{ matrix.BUILD_PROP[2] }}
 
     - name: Creates new container
       if: steps.container-cache.outputs.cache-hit != 'true'
       run: |
         docker run --name the_container --interactive -v /:/host -v $(pwd):/gfort2py ${DOCKER_CONTAINER} /bin/bash -c "
-          apt update &&
-          apt install -y cmake git python3 python-is-python3 python3-dev python3-pip python3-numpy automake &&
+          apt-get update &&
+          apt-get install -y cmake git python3 python-is-python3 python3-dev python3-pip python3-numpy automake  libc6-dev &&
           mkdir -p /lib64 && ln -s /host/lib64/ld-* /lib64/ &&
           ln -s /host/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu &&
           rm -rf /usr/${TOOLCHAIN_NAME} && ln -s /host/usr/${TOOLCHAIN_NAME} /usr/${TOOLCHAIN_NAME} &&
@@ -92,7 +92,7 @@ jobs:
           rm -f /usr/bin/ld.bfd && ln -s /host/usr/bin/${TOOLCHAIN_NAME}-ld.bfd /usr/bin/ld.bfd &&
           rm -f /usr/bin/ninja && ln -s /host/usr/bin/ninja /usr/bin/ninja &&
           git config --global --add safe.directory /gfort2py &&
-          python -m pip install build wheel pytest cpyparsing &&
+          python -m pip install build wheel pytest &&
           rm -f /usr/local/bin/ninja && mkdir -p /usr/local/bin && ln -s /host/usr/bin/ninja /usr/local/bin/ninja
         "
         docker commit the_container the_container
@@ -107,7 +107,7 @@ jobs:
       run: |
         docker run --rm -e "TERM=xterm-256color" -v $(pwd):/gfort2py -v /:/host the_container \
         /bin/script -e -q -c "/bin/bash --noprofile --norc -eo pipefail -c '
-          cd /gfort2py && spin build --clean -- ${MESON_OPTIONS}
+          cd /gfort2py && pip install .
         '"
 
     - name: Meson Log