Skip to content

Commit be7e4ea

Browse files
authored
Fix F Prime location in LedBlinker CI (#3988)
* Fix F Prime location in LedBlinker CI * Fix framing-selection
1 parent 21faffa commit be7e4ea

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/ext-aarch64-linux-led-blinker.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
AARCH64_TOOLCHAIN_DIR: /tmp/aarch64-toolchain
2424
AARCH64_TOOLCHAIN_URL: https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz
2525
ARM_TOOLS_PATH: /tmp/aarch64-toolchain
26+
FPRIME_LOCATION: ./lib/fprime
2627

2728
jobs:
2829
get-branch:
@@ -46,11 +47,11 @@ jobs:
4647
uses: actions/checkout@v4
4748
with:
4849
submodules: true
49-
path: ./fprime
50+
path: ${{ env.FPRIME_LOCATION }}
5051
fetch-depth: 0
51-
- uses: ./fprime/.github/actions/setup
52+
- uses: ./lib/fprime/.github/actions/setup
5253
with:
53-
location: ./fprime
54+
location: ${{ env.FPRIME_LOCATION }}
5455
- name: "Download and Setup AArch64 Linux Toolchain"
5556
run: |
5657
mkdir -p ${AARCH64_TOOLCHAIN_DIR}
@@ -99,7 +100,7 @@ jobs:
99100
. venv/bin/activate
100101
mkdir -p ci-logs
101102
chmod +x ./build-artifacts/aarch64-linux/LedBlinker/bin/LedBlinker
102-
fprime-gds --ip-client --framing-selection fprime -d ./build-artifacts/aarch64-linux/LedBlinker --logs ./ci-logs &
103+
fprime-gds --ip-client -d ./build-artifacts/aarch64-linux/LedBlinker --logs ./ci-logs &
103104
sleep 10
104105
pytest --dictionary ./build-artifacts/aarch64-linux/LedBlinker/dict/LedBlinkerTopologyDictionary.json ./int/led_integration_tests.py
105106
- name: 'Archive logs'

.github/workflows/ext-build-led-blinker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
uses: ./.github/workflows/reusable-project-builder.yml
3232
with:
3333
target_repository: fprime-community/fprime-workshop-led-blinker
34+
fprime_location: lib/fprime
3435
build_location: LedBlinker
3536
run_unit_tests: true
3637
target_ref: ${{ needs.get-branch.outputs.target-branch }}

.github/workflows/ext-raspberry-led-blinker.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ concurrency:
2121

2222
env:
2323
RPI_TOOLCHAIN_DIR: /tmp/rpi-toolchain
24+
FPRIME_LOCATION: ./lib/fprime
2425

2526
jobs:
2627
get-branch:
@@ -44,11 +45,11 @@ jobs:
4445
uses: actions/checkout@v4
4546
with:
4647
submodules: true
47-
path: ./fprime
48+
path: ${{ env.FPRIME_LOCATION }}
4849
fetch-depth: 0
49-
- uses: ./fprime/.github/actions/setup
50+
- uses: ./lib/fprime/.github/actions/setup
5051
with:
51-
location: ./fprime
52+
location: ${{ env.FPRIME_LOCATION }}
5253
- name: "Setup RPI Toolchain"
5354
uses: fprime-community/setup-rpi-sysroot@main
5455
- name: "Generate RPI Build Cache"
@@ -93,7 +94,7 @@ jobs:
9394
. venv/bin/activate
9495
mkdir -p ci-logs
9596
chmod +x ./build-artifacts/raspberrypi/LedBlinker/bin/LedBlinker
96-
fprime-gds --ip-client --framing-selection fprime -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs &
97+
fprime-gds --ip-client -d ./build-artifacts/raspberrypi/LedBlinker --logs ./ci-logs &
9798
sleep 10
9899
pytest --dictionary ./build-artifacts/raspberrypi/LedBlinker/dict/LedBlinkerTopologyDictionary.json ./int/led_integration_tests.py
99100
- name: 'Archive logs'

0 commit comments

Comments
 (0)