From 049f59d7de33d06334701b1c3de6829c240d843f Mon Sep 17 00:00:00 2001
From: kamilritz <kritz@ethz.ch>
Date: Fri, 10 Jul 2020 22:36:21 +0200
Subject: [PATCH] Fix firmware-build-test

---
 .github/workflows/firmware_build_test.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/firmware_build_test.yml b/.github/workflows/firmware_build_test.yml
index 89eb3c89e9..0bd701fc94 100644
--- a/.github/workflows/firmware_build_test.yml
+++ b/.github/workflows/firmware_build_test.yml
@@ -11,35 +11,36 @@ on:
 jobs:
   Firmware-build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-03-29
+    container: px4io/px4-dev-base-focal:2020-05-12
     env:
       GIT_COMMITTER_EMAIL: bot@px4.io
       GIT_COMMITTER_NAME: PX4BuildBot
     steps:
     - name: Checkout Firmware master
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2.3.1
       with:
         repository: PX4/Firmware
         ref: master
+        path: Firmware
+        fetch-depth: 0
         submodules: recurvise
     - name: Checkout matching branch on PX4/Firmware if possible
       run: |
-        git fetch origin
         git checkout ${{github.head_ref}} || echo "Firmware branch: ${{github.head_ref}} not found, using master instead"
         git submodule update --init --recursive
-      working-directory: ../Firmware
+      working-directory: Firmware
     - name: Configure Firmware to include current ECL version
-      working-directory: ../Firmware/src/lib/ecl
+      working-directory: Firmware/src/lib/ecl
       run: |
-        git fetch origin ${{ github.ref }}
-        git checkout ${{ github.sha }}
+        git fetch origin pull/${{github.event.pull_request.number}}/head:${{github.head_ref}}
+        git checkout ${{github.head_ref}}
     - name: Add and commit new ECL version
       run: |
         git config --global user.email "${GIT_COMMITTER_EMAIL}"
         git config --global user.name "${GIT_COMMITTER_NAME}"
         git add src/lib/ecl
         git commit -m "Update ECL"
-      working-directory: ../Firmware
+      working-directory: Firmware
     - name: Build Firmware
-      working-directory: ../Firmware
+      working-directory: Firmware
       run: make