From 8cef276ecabbd207ddc9d9754c59528be6bedf8b Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 21 Aug 2023 18:07:18 -0700 Subject: [PATCH 01/21] Add RPI build workflow --- .github/workflows/build-rpi-led-blinker.yml | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/build-rpi-led-blinker.yml diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml new file mode 100644 index 0000000000..7ee19ee171 --- /dev/null +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -0,0 +1,24 @@ +# Builds and runs UTs on https://github.com/fprime-community/fprime-workshop-led-blinker +# Runs on RaspberryPi + +name: "RaspberryPi" + +on: + push: + branches: [ master, devel, rpi-ledblinker ] + pull_request: + branches: [ master, devel ] + paths-ignore: + - 'docs/**' + - '**.md' + +jobs: + run: + name: "" + uses: ./.github/workflows/reusable-builder.yml + with: + target_repository: fprime-community/fprime-workshop-led-blinker + build_location: LedBlinker + run_unit_tests: true + runs_on: raspberrypi + target_platform: raspberrypi From 0b8fac0013fcf05c1ec6b9ffca9ce858c8aa59d2 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 11:51:38 -0700 Subject: [PATCH 02/21] Update workflow to cross-compile --- .github/workflows/build-rpi-led-blinker.yml | 54 +++++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 7ee19ee171..a82131d827 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -11,14 +11,50 @@ on: paths-ignore: - 'docs/**' - '**.md' + - '.github/actions/spelling/**' + - '.github/ISSUE_TEMPLATE/**' jobs: - run: - name: "" - uses: ./.github/workflows/reusable-builder.yml - with: - target_repository: fprime-community/fprime-workshop-led-blinker - build_location: LedBlinker - run_unit_tests: true - runs_on: raspberrypi - target_platform: raspberrypi + cross-compilation: + name: "Cross Compilation" + runs-on: ubuntu-latest + steps: + - name: "Checkout target repository" + uses: actions/checkout@v3 + with: + submodules: recursive + repository: fprime-community/fprime-workshop-led-blinker + - name: "Overlay current F´ revision" + uses: actions/checkout@v3 + with: + submodules: recursive + path: ./fprime + fetch-depth: 0 + # - uses: ./.github/actions/setup + - name: "Setup RPI Toolchain" + uses: fprime-community/setup-rpi-sysroot@main + - name: "Generate RPI Build Cache" + run: | + fprime-util generate raspberrypi + - name: "Build RPI" + run: | + fprime-util build raspberrypi + - name: "Prepare artifacts" + run: | + mkdir -p rpi-artifacts + cp -r ./build-artifacts rpi-artifacts + # Build Artifacts + - name: 'RPI Build Output' + uses: actions/upload-artifact@v3 + with: + name: rpi-artifacts + path: rpi-artifacts + retention-days: 5 + # Archive the outputs + - name: 'Archive Logs' + uses: actions/upload-artifact@v3 + if: always() + with: + name: rpi-logs + path: ci-logs.tar.gz + retention-days: 5 From a55ac3f1fd8d4abc8b52ace92a7c027aa94d8710 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 11:56:55 -0700 Subject: [PATCH 03/21] Add RPI_TOOLCHAIN_DIR --- .github/workflows/build-rpi-led-blinker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index a82131d827..d33fb9f6c1 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -14,6 +14,9 @@ on: - '.github/actions/spelling/**' - '.github/ISSUE_TEMPLATE/**' +env: + RPI_TOOLCHAIN_DIR: /tmp/rpi-toolchain + jobs: cross-compilation: name: "Cross Compilation" From 6b42f67c97733cc78ab1397720a861beddaf6cfb Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 12:00:02 -0700 Subject: [PATCH 04/21] Use Setup action --- .github/workflows/build-rpi-led-blinker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index d33fb9f6c1..d792d47299 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -33,7 +33,9 @@ jobs: submodules: recursive path: ./fprime fetch-depth: 0 - # - uses: ./.github/actions/setup + - uses: ./.github/actions/setup + with: + location: ./fprime - name: "Setup RPI Toolchain" uses: fprime-community/setup-rpi-sysroot@main - name: "Generate RPI Build Cache" From 3e0a2ec7e3d8881a65b74dcf519040b44238bafe Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 12:01:54 -0700 Subject: [PATCH 05/21] Correct setup action --- .github/workflows/build-rpi-led-blinker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index d792d47299..97e594aa20 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -33,7 +33,7 @@ jobs: submodules: recursive path: ./fprime fetch-depth: 0 - - uses: ./.github/actions/setup + - uses: ./fprime/.github/actions/setup with: location: ./fprime - name: "Setup RPI Toolchain" From ed12461ec7ee7097a4be542499f9d7dfa7b8c4bb Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 16:54:30 -0700 Subject: [PATCH 06/21] RPI integration --- .github/workflows/build-rpi-led-blinker.yml | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 97e594aa20..ec92137fa8 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -48,6 +48,7 @@ jobs: run: | mkdir -p rpi-artifacts cp -r ./build-artifacts rpi-artifacts + cp -r Components/Led/test/int rpi-artifacts # Build Artifacts - name: 'RPI Build Output' uses: actions/upload-artifact@v3 @@ -63,3 +64,29 @@ jobs: name: rpi-logs path: ci-logs.tar.gz retention-days: 5 + + RPI-Integration: + runs-on: self-hosted + needs: cross-compilation + steps: + - name: "Artifacts Download" + uses: actions/download-artifact@v3 + with: + name: rpi-artifacts + - name: RPI Integration Tests + run: | + ls -l + chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker + fprime-gds -d build-artifacts/raspberrypi/LedBlinker & 2>&1 > ./ci-logs/gds.log + sleep 10 + pytest build-artifacts/int/led_integration_tests.py & 2>&1 > ./ci-logs/led_integration_tests.log + - name: 'Collect Logs' + run: | + tar -czvf ci-logs.tar.gz ci-logs + - name: 'Archive logs' + uses: actions/upload-artifact@v3 + if: always() + with: + name: rpi-logs + path: ci-logs.tar.gz + retention-days: 5 From 2f07abebc7cb07505ca4986b52b488578547c9dc Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 17:23:54 -0700 Subject: [PATCH 07/21] Install fprime-gds on RPI --- .github/workflows/build-rpi-led-blinker.yml | 48 ++++++++++++--------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index ec92137fa8..31220f64ee 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -69,24 +69,30 @@ jobs: runs-on: self-hosted needs: cross-compilation steps: - - name: "Artifacts Download" - uses: actions/download-artifact@v3 - with: - name: rpi-artifacts - - name: RPI Integration Tests - run: | - ls -l - chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker - fprime-gds -d build-artifacts/raspberrypi/LedBlinker & 2>&1 > ./ci-logs/gds.log - sleep 10 - pytest build-artifacts/int/led_integration_tests.py & 2>&1 > ./ci-logs/led_integration_tests.log - - name: 'Collect Logs' - run: | - tar -czvf ci-logs.tar.gz ci-logs - - name: 'Archive logs' - uses: actions/upload-artifact@v3 - if: always() - with: - name: rpi-logs - path: ci-logs.tar.gz - retention-days: 5 + - name: "Setup environment" + run: | + python -m venv venv + . venv/bin/activate + pip install fprime-gds + - name: "Artifacts Download" + uses: actions/download-artifact@v3 + with: + name: rpi-artifacts + - name: RPI Integration Tests + run: | + ls -l + pwd + chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker + fprime-gds -d build-artifacts/raspberrypi/LedBlinker & 2>&1 > ./ci-logs/gds.log + sleep 10 + pytest build-artifacts/int/led_integration_tests.py & 2>&1 > ./ci-logs/led_integration_tests.log + - name: 'Collect Logs' + run: | + tar -czvf ci-logs.tar.gz ci-logs + - name: 'Archive logs' + uses: actions/upload-artifact@v3 + if: always() + with: + name: rpi-logs + path: ci-logs.tar.gz + retention-days: 5 From 30bc5d23ce5f911a7fc94836990538d75a6cd4b4 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 17:31:47 -0700 Subject: [PATCH 08/21] activate venv --- .github/workflows/build-rpi-led-blinker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 31220f64ee..8ff7a68606 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -80,6 +80,7 @@ jobs: name: rpi-artifacts - name: RPI Integration Tests run: | + . venv/bin/activate ls -l pwd chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker From 4bb6c453114211dacd0eacec350f3cb53281a73d Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 17:44:39 -0700 Subject: [PATCH 09/21] create log folder --- .github/workflows/build-rpi-led-blinker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 8ff7a68606..fb3e7bbe64 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -83,6 +83,7 @@ jobs: . venv/bin/activate ls -l pwd + mkdir -p ci-logs chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker fprime-gds -d build-artifacts/raspberrypi/LedBlinker & 2>&1 > ./ci-logs/gds.log sleep 10 From 5c24d517bec606b174b2b38f69556084b853758c Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 18:06:33 -0700 Subject: [PATCH 10/21] fix paths --- .github/workflows/build-rpi-led-blinker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index fb3e7bbe64..eb37aae857 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -84,10 +84,10 @@ jobs: ls -l pwd mkdir -p ci-logs - chmod +x build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker - fprime-gds -d build-artifacts/raspberrypi/LedBlinker & 2>&1 > ./ci-logs/gds.log + chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker + fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker 2>&1 > ./ci-logs/gds.log & sleep 10 - pytest build-artifacts/int/led_integration_tests.py & 2>&1 > ./ci-logs/led_integration_tests.log + pytest ./int/led_integration_tests.py 2>&1 > ./ci-logs/led_integration_tests.log - name: 'Collect Logs' run: | tar -czvf ci-logs.tar.gz ci-logs From 12639d6b9de7e09ebe56822809c5773ad391dbff Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 28 Aug 2023 18:21:35 -0700 Subject: [PATCH 11/21] Pytest usage --- .github/workflows/build-rpi-led-blinker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index eb37aae857..cc1a2fd5ac 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -85,9 +85,9 @@ jobs: pwd mkdir -p ci-logs chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker - fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker 2>&1 > ./ci-logs/gds.log & + fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker > ./ci-logs/gds.log & sleep 10 - pytest ./int/led_integration_tests.py 2>&1 > ./ci-logs/led_integration_tests.log + pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py > ./ci-logs/led_integration_tests.log - name: 'Collect Logs' run: | tar -czvf ci-logs.tar.gz ci-logs From bde71f2301312feebc369ef9def03537cd8a75ff Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 16:05:07 -0700 Subject: [PATCH 12/21] handle logs better --- .github/workflows/build-rpi-led-blinker.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index cc1a2fd5ac..0ab6d719bc 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -56,16 +56,9 @@ jobs: name: rpi-artifacts path: rpi-artifacts retention-days: 5 - # Archive the outputs - - name: 'Archive Logs' - uses: actions/upload-artifact@v3 - if: always() - with: - name: rpi-logs - path: ci-logs.tar.gz - retention-days: 5 RPI-Integration: + name: "RPI Integration Tests" runs-on: self-hosted needs: cross-compilation steps: @@ -81,13 +74,11 @@ jobs: - name: RPI Integration Tests run: | . venv/bin/activate - ls -l - pwd mkdir -p ci-logs chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker - fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker > ./ci-logs/gds.log & + fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & sleep 10 - pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py > ./ci-logs/led_integration_tests.log + pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py | tee > ./ci-logs/led_integration_tests.log - name: 'Collect Logs' run: | tar -czvf ci-logs.tar.gz ci-logs From e0102dc0a0f822c00ff7b66090a26e9167e30c67 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 16:12:14 -0700 Subject: [PATCH 13/21] Fix tee usage --- .github/workflows/build-rpi-led-blinker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 0ab6d719bc..a72e304a2b 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -78,7 +78,7 @@ jobs: chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & sleep 10 - pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py | tee > ./ci-logs/led_integration_tests.log + pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py | tee ./ci-logs/led_integration_tests.log - name: 'Collect Logs' run: | tar -czvf ci-logs.tar.gz ci-logs From 629421f8727b7ad5bc3d38ae6ef8261aa6efcbea Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 16:32:22 -0700 Subject: [PATCH 14/21] final touch --- .github/workflows/build-rpi-led-blinker.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index a72e304a2b..678bb4e904 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -1,7 +1,7 @@ -# Builds and runs UTs on https://github.com/fprime-community/fprime-workshop-led-blinker -# Runs on RaspberryPi +# Cross-compile https://github.com/fprime-community/fprime-workshop-led-blinker +# Runs integration tests on RaspberryPi -name: "RaspberryPi" +name: "RPI LedBlinker" on: push: @@ -49,15 +49,14 @@ jobs: mkdir -p rpi-artifacts cp -r ./build-artifacts rpi-artifacts cp -r Components/Led/test/int rpi-artifacts - # Build Artifacts - - name: 'RPI Build Output' + - name: 'Archive Build Artifacts' uses: actions/upload-artifact@v3 with: name: rpi-artifacts path: rpi-artifacts retention-days: 5 - RPI-Integration: + RPI-integration: name: "RPI Integration Tests" runs-on: self-hosted needs: cross-compilation @@ -71,7 +70,7 @@ jobs: uses: actions/download-artifact@v3 with: name: rpi-artifacts - - name: RPI Integration Tests + - name: Run Integration Tests run: | . venv/bin/activate mkdir -p ci-logs @@ -79,13 +78,10 @@ jobs: fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & sleep 10 pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py | tee ./ci-logs/led_integration_tests.log - - name: 'Collect Logs' - run: | - tar -czvf ci-logs.tar.gz ci-logs - name: 'Archive logs' uses: actions/upload-artifact@v3 if: always() with: name: rpi-logs - path: ci-logs.tar.gz + path: ci-logs retention-days: 5 From 6cc2e66de6771bbfb39f1e31c5f0d327c4a87c87 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 16:43:07 -0700 Subject: [PATCH 15/21] remove push trigger --- .github/workflows/build-rpi-led-blinker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 678bb4e904..04ce40c491 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -5,7 +5,7 @@ name: "RPI LedBlinker" on: push: - branches: [ master, devel, rpi-ledblinker ] + branches: [ master, devel ] pull_request: branches: [ master, devel ] paths-ignore: From 24e22878d344e320c74f9e5bb717e8bc96c44763 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 17:20:47 -0700 Subject: [PATCH 16/21] Use tutorial's devel branch --- .github/workflows/build-rpi-led-blinker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 04ce40c491..bed325c2f2 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -27,6 +27,7 @@ jobs: with: submodules: recursive repository: fprime-community/fprime-workshop-led-blinker + ref: devel - name: "Overlay current F´ revision" uses: actions/checkout@v3 with: From 3e8da1901e85afc021009209e3748545a6530e29 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 17:54:53 -0700 Subject: [PATCH 17/21] log to action's output instead of file --- .github/workflows/build-rpi-led-blinker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index bed325c2f2..8bbe1bbee1 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -78,7 +78,7 @@ jobs: chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & sleep 10 - pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py | tee ./ci-logs/led_integration_tests.log + pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py - name: 'Archive logs' uses: actions/upload-artifact@v3 if: always() From 2ca60c7b9d97a0c853d586353c658949f4fa9646 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Wed, 30 Aug 2023 18:09:56 -0700 Subject: [PATCH 18/21] GDS --ip-client --- .github/workflows/build-rpi-led-blinker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/build-rpi-led-blinker.yml index 8bbe1bbee1..1aee1450a7 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/build-rpi-led-blinker.yml @@ -76,7 +76,7 @@ jobs: . venv/bin/activate mkdir -p ci-logs chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker - fprime-gds -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & + fprime-gds --ip-client -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs & sleep 10 pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyAppDictionary.xml ./int/led_integration_tests.py - name: 'Archive logs' From c58c820c059d870f7081fae715652fbb06285a7e Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Tue, 24 Oct 2023 17:15:05 -0700 Subject: [PATCH 19/21] Renaming external build workflows --- .../{build-tutorial-hello-world.yml => ext-build-hello-world.yml} | 0 .../{build-tutorial-led-blinker.yml => ext-build-led-blinker.yml} | 0 .../{build-tutorial-math-comp.yml => ext-build-math-comp.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build-tutorial-hello-world.yml => ext-build-hello-world.yml} (100%) rename .github/workflows/{build-tutorial-led-blinker.yml => ext-build-led-blinker.yml} (100%) rename .github/workflows/{build-tutorial-math-comp.yml => ext-build-math-comp.yml} (100%) diff --git a/.github/workflows/build-tutorial-hello-world.yml b/.github/workflows/ext-build-hello-world.yml similarity index 100% rename from .github/workflows/build-tutorial-hello-world.yml rename to .github/workflows/ext-build-hello-world.yml diff --git a/.github/workflows/build-tutorial-led-blinker.yml b/.github/workflows/ext-build-led-blinker.yml similarity index 100% rename from .github/workflows/build-tutorial-led-blinker.yml rename to .github/workflows/ext-build-led-blinker.yml diff --git a/.github/workflows/build-tutorial-math-comp.yml b/.github/workflows/ext-build-math-comp.yml similarity index 100% rename from .github/workflows/build-tutorial-math-comp.yml rename to .github/workflows/ext-build-math-comp.yml From fed90bfd6a72895791f914c02e41bbd1ca25ada9 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Tue, 24 Oct 2023 17:15:19 -0700 Subject: [PATCH 20/21] Add get_target_branch to RPI workflow --- ...-rpi-led-blinker.yml => ext-raspberry-led-blinker.yml} | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename .github/workflows/{build-rpi-led-blinker.yml => ext-raspberry-led-blinker.yml} (91%) diff --git a/.github/workflows/build-rpi-led-blinker.yml b/.github/workflows/ext-raspberry-led-blinker.yml similarity index 91% rename from .github/workflows/build-rpi-led-blinker.yml rename to .github/workflows/ext-raspberry-led-blinker.yml index 1aee1450a7..d4cec89b9e 100644 --- a/.github/workflows/build-rpi-led-blinker.yml +++ b/.github/workflows/ext-raspberry-led-blinker.yml @@ -18,6 +18,12 @@ env: RPI_TOOLCHAIN_DIR: /tmp/rpi-toolchain jobs: + get-branch: + name: "Get target branch" + uses: ./.github/workflows/reusable-get-pr-branch.yml + with: + target_repository: fprime-community/fprime-workshop-led-blinker + cross-compilation: name: "Cross Compilation" runs-on: ubuntu-latest @@ -27,7 +33,7 @@ jobs: with: submodules: recursive repository: fprime-community/fprime-workshop-led-blinker - ref: devel + ref: ${{ needs.get-branch.outputs.target-branch }} - name: "Overlay current F´ revision" uses: actions/checkout@v3 with: From ea9422ec5c2824bcb2d20bb7c7335dcbc42ecb37 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Tue, 24 Oct 2023 18:17:50 -0700 Subject: [PATCH 21/21] bombastic side eye --- .github/workflows/ext-raspberry-led-blinker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ext-raspberry-led-blinker.yml b/.github/workflows/ext-raspberry-led-blinker.yml index d4cec89b9e..b7b2ca61e0 100644 --- a/.github/workflows/ext-raspberry-led-blinker.yml +++ b/.github/workflows/ext-raspberry-led-blinker.yml @@ -27,6 +27,7 @@ jobs: cross-compilation: name: "Cross Compilation" runs-on: ubuntu-latest + needs: get-branch steps: - name: "Checkout target repository" uses: actions/checkout@v3