WIP

lief-project · Oct 22, 2023 · 18b1ec9 · 18b1ec9
1 parent bfa3d55
commit 18b1ec9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -36,7 +36,7 @@ jobs:
            -e CCACHE_DIR=/ccache      \
            -v $GITHUB_WORKSPACE:/work \
            -v $HOME/.ccache:/ccache   \
-          --rm liefproject/android-${ARCH} bash /work/scripts/docker/android-sdk-${ARCH}.sh
+          --rm liefproject/android-${ARCH} bash /work/scripts/docker/android-sdk-${ARCH}
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -28,10 +28,10 @@ jobs:
             -e CCACHE_COMPRESS=1                  \
             -e CCACHE_MAXSIZE=10.0G               \
             -e CCACHE_DIR=/ccache                 \
-            -v $GITHUB_WORKSPACE:/work            \
+            -v $GITHUB_WORKSPACE:/src             \
             -v $RUNNER_TEMP/lief-install:/install \
             -v $HOME/.ccache:/ccache              \
-            liefproject/manylinux2014-aarch64 bash /work/scripts/docker/linux-sdk-aarch64
+            liefproject/manylinux2014-aarch64 bash /src/scripts/docker/linux-sdk-aarch64
       - name: 'Upload SDK Artifact'
         uses: actions/upload-artifact@v3
         with:
@@ -84,10 +84,10 @@ jobs:
            -e CCACHE_DIR=/ccache                                \
            -e PYTHON_VERSION=$PYTHON_VERSION_ALT                \
            -e PYTHON_BINARY=/opt/python/cp${PYTHON_VERSION_ALT}-cp${PYTHON_VERSION_ALT}/bin/python${PYTHON_VERSION} \
-           -v $GITHUB_WORKSPACE:/work                           \
+           -v $GITHUB_WORKSPACE:/src                           \
            -v $HOME/.ccache:/ccache                             \
            -v $RUNNER_TEMP/lief-install:/install                \
-           liefproject/manylinux2014-aarch64 bash /work/scripts/docker/linux-py-aarch64
+           liefproject/manylinux2014-aarch64 bash /src/scripts/docker/linux-py-aarch64
       - name: 'Artifact'
         uses: actions/upload-artifact@v3
         with:

diff --git a/scripts/docker/linux-py-aarch64 b/scripts/docker/linux-py-aarch64
@@ -8,11 +8,11 @@ export LIEF_BUILD_DIR=/tmp/lief-build
 export _PYTHON_HOST_PLATFORM="manylinux2014-aarch64"
 export SETUPTOOLS_EXT_SUFFIX=$($PYTHON_BINARY -c "import sysconfig;print(sysconfig.get_config_var('EXT_SUFFIX').replace('x86_64', 'aarch64'))")
 
-git config --global --add safe.directory /work
+git config --global --add safe.directory /src
 
 $PYTHON_BINARY -m pip install tomli pip wheel
 
-pushd /work/api/python
-export PYLIEF_CONF=/work/scripts/docker/config/pylinux-aarch64.toml
-$PYTHON_BINARY -m pip -vvv wheel --no-build-isolation --wheel-dir=/work/dist .
+pushd /src/api/python
+export PYLIEF_CONF=/src/scripts/docker/config/pylinux-aarch64.toml
+$PYTHON_BINARY -m pip -vvv wheel --no-build-isolation --wheel-dir=/src/dist .
 popd
diff --git a/scripts/docker/linux-sdk-aarch64 b/scripts/docker/linux-sdk-aarch64
@@ -6,20 +6,21 @@ CFLAGS='-ffunction-sections -fdata-sections -static-libgcc'
 export LDFLAGS='-Wl,--gc-sections -Wl,--exclude-libs,ALL'
 
 ARCH_DIR="linux-aarch64"
-git config --global --add safe.directory /work
+
+git config --global --add safe.directory /src
 
 mkdir -p build/$ARCH_DIR/static-release
 mkdir -p build/$ARCH_DIR/shared-release
 
-cmake -S /work -B /work/build/$ARCH_DIR/shared-release -GNinja \
+cmake -S /src -B /src/build/$ARCH_DIR/shared-release -GNinja \
   -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                \
   -DCMAKE_C_FLAGS="$CFLAGS"                                    \
   -DCMAKE_LINK_WHAT_YOU_USE=on                                 \
   -DBUILD_SHARED_LIBS=on                                       \
   -DLIEF_INSTALL_COMPILED_EXAMPLES=off                         \
   -DCMAKE_BUILD_TYPE=Release
 
-cmake -S /work -B /work/build/$ARCH_DIR/static-release -GNinja \
+cmake -S /src -B /src/build/$ARCH_DIR/static-release -GNinja \
   -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                \
   -DCMAKE_C_FLAGS="$CFLAGS"                                    \
   -DCMAKE_LINK_WHAT_YOU_USE=on                                 \