Try again.

pimoroni · Dec 2, 2024 · 09e90cc · 09e90cc
1 parent 8f9ac9c
commit 09e90cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -46,21 +46,21 @@ jobs:
     - name: "Prepare tools & dependencies"
       shell: bash
       run: |
-        source $BUILD_TOOLS && ci_github_actions_fixup
+        source $BUILD_TOOLS && ci_github_actions_fixup $BUILD_TOOLS
         ci_apt_install_build_deps
         ci_prepare_all
 
     - name: "MicroPython: Configure"
       shell: bash
       run: |
-        source $BUILD_TOOLS && ci_github_actions_fixup
+        source $BUILD_TOOLS && ci_github_actions_fixup $BUILD_TOOLS
         micropython_version
         ci_cmake_configure ${{ matrix.name }}
 
     - name: "MicroPython: Build"
       shell: bash
       run: |
-        source $BUILD_TOOLS && ci_github_actions_fixup
+        source $BUILD_TOOLS && ci_github_actions_fixup $BUILD_TOOLS
         ci_cmake_build ${{ matrix.name }}
         mv build-${{ matrix.name }}.uf2 ${{ env.RELEASE_FILE }}.uf2
 

diff --git a/ci/micropython.sh b/ci/micropython.sh
@@ -77,8 +77,9 @@ function ci_prepare_all {
 
 function ci_github_actions_fixup {
     # GitHub Actions meddles with . and source causing our paths to be broken
-    # This fixup attempts to put things right
-    export CI_PROJECT_ROOT="$(pwd)"
+    # This fixup attempts to put things right\
+    SCRIPT_PATH=$1
+    CI_PROJECT_ROOT=$(realpath "$SCRIPT_PATH/..")
     export CI_BUILD_ROOT="$(pwd)/build"
     mkdir -p "$CI_BUILD_ROOT"
     log_inform "Project root: $CI_PROJECT_ROOT"