From 3c282ef845b198517022ea1aaeaca744fdaae692 Mon Sep 17 00:00:00 2001
From: Timo Sairiala <timo.sairiala@unikie.com>
Date: Fri, 27 Oct 2023 14:02:46 +0300
Subject: [PATCH] DP-7313 add fpga and bootloader-v2 binaries to px4 container

---
 .github/dependabot.yml                        |  6 +++
 .../workflows/tiiuae-pixhawk-and-saluki.yaml  | 38 ++++++++++++++++---
 Tools/px_uploader.Dockerfile                  | 15 ++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..5ace4600a1f2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
index 439e8b1c3b56..4abeb257770f 100644
--- a/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
+++ b/.github/workflows/tiiuae-pixhawk-and-saluki.yaml
@@ -7,11 +7,23 @@ on:
     branches: [ main ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      jfrog-upload:
+        description: 'upload to Artifactory'
+        required: false
+        default: true
+        type: boolean
 
 permissions:
   contents: read
   packages: write
 
+env:
+  saluki_pi_fpga_version: "sha-6dc384d"
+  saluki_v2_fpga_version: "sha-6dc384d"
+  saluki_v3_fpga_version: "sha-6dc384d"
+  bootloader_v2_version: "master"
+
 jobs:
   fc_matrix:
     strategy:
@@ -62,7 +74,6 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - px4fwupdater
-    if: true
     steps:
       - name: Checkout px4-firmware
         uses: actions/checkout@v3
@@ -98,6 +109,11 @@ jobs:
           file: px4-firmware/Tools/px_uploader.Dockerfile
           tags: ${{ steps.containermeta.outputs.tags }}
           labels: ${{ steps.containermeta.outputs.labels }}
+          build-args: |
+            "saluki_pi_fpga_version=${{ env.saluki_pi_fpga_version }}"
+            "saluki_v2_fpga_version=${{ env.saluki_v2_fpga_version }}"
+            "saluki_v3_fpga_version=${{ env.saluki_v3_fpga_version }}"
+            "bootloader_v2_version=${{ env.bootloader_v2_version }}"
 
   upload-px4fwupdater-uae:
     name: upload px4fwupdater to UAE docker registry
@@ -131,6 +147,13 @@ jobs:
           registry: artifactory.ssrcdevops.tii.ae
           username: ${{ secrets.UAE_RT_USER }}
           password: ${{ secrets.UAE_RT_APIKEY }}
+      # have to login to ghcr as well to download fpga and BL
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Firmware flasher - Build and push
         uses: docker/build-push-action@v3
         with:
@@ -139,14 +162,19 @@ jobs:
           file: px4-firmware/Tools/px_uploader.Dockerfile
           tags: ${{ steps.containermeta.outputs.tags }}
           labels: ${{ steps.containermeta.outputs.labels }}
+          build-args: |
+            "saluki_pi_fpga_version=${{ env.saluki_pi_fpga_version }}"
+            "saluki_v2_fpga_version=${{ env.saluki_v2_fpga_version }}"
+            "saluki_v3_fpga_version=${{ env.saluki_v3_fpga_version }}"
+            "bootloader_v2_version=${{ env.bootloader_v2_version }}"
 
   artifactory:
     name: upload builds to artifactory
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.jfrog-upload == true }}
     runs-on: ubuntu-latest
     needs:
       - px4fwupdater
       - fc_matrix
-    if: true
     steps:
       - name: Download pixhawk artifacts
         uses: actions/download-artifact@v3
@@ -174,7 +202,7 @@ jobs:
           |--------|------|"
           artifactory_base_url="https://ssrc.jfrog.io/artifactory/"
 
-          for pkg in $(find bin -type f); do
+          for pkg in $(find bin -type f|sort); do
 
             file_name=$(basename $pkg)
             ext="${file_name##*.}"
@@ -217,11 +245,11 @@ jobs:
 
   artifactory-uae:
     name: upload builds to UAE artifactory
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.jfrog-upload == true }}
     runs-on: ubuntu-latest
     needs:
       - px4fwupdater
       - fc_matrix
-    if: true
     steps:
       - name: Download pixhawk artifacts
         uses: actions/download-artifact@v3
@@ -249,7 +277,7 @@ jobs:
           |--------|------|"
           artifactory_base_url="https://artifactory.ssrcdevops.tii.ae/artifactory/"
 
-          for pkg in $(find bin -type f); do
+          for pkg in $(find bin -type f|sort); do
 
             file_name=$(basename $pkg)
             ext="${file_name##*.}"
diff --git a/Tools/px_uploader.Dockerfile b/Tools/px_uploader.Dockerfile
index 728b0d878dc4..0d64093738aa 100644
--- a/Tools/px_uploader.Dockerfile
+++ b/Tools/px_uploader.Dockerfile
@@ -1,3 +1,13 @@
+ARG saluki_pi_fpga_version
+ARG saluki_v2_fpga_version
+ARG saluki_v3_fpga_version
+ARG bootloader_v2_version
+
+FROM ghcr.io/tiiuae/saluki-pi-fpga:$saluki_pi_fpga_version AS SALUKI_PI
+FROM ghcr.io/tiiuae/saluki-pi-fpga:$saluki_v2_fpga_version AS SALUKI_V2
+FROM ghcr.io/tiiuae/saluki-pi-fpga:$saluki_v3_fpga_version AS SALUKI_V3
+FROM ghcr.io/tiiuae/saluki_bootloader_v2:$bootloader_v2_version AS BOOTLOADER_V2
+
 FROM python:alpine3.14
 
 # run this with something like:
@@ -17,6 +27,11 @@ FROM python:alpine3.14
 # ("/" above is relative to GH action runner home dir)
 # (see .github/workflows/tiiuae-pixhawk.yaml)
 
+COPY --from=SALUKI_PI /firmware/saluki_pi-fpga /firmware/fpga/saluki_pi
+COPY --from=SALUKI_V2 /firmware/saluki_v2-fpga /firmware/fpga/saluki_v2
+COPY --from=SALUKI_V3 /firmware/saluki_v3-fpga /firmware/fpga/saluki_v3
+COPY --from=BOOTLOADER_V2 firmware/bootloader_v2 /firmware/bootloader_v2
+
 WORKDIR /firmware
 
 ENTRYPOINT ["/entrypoint.sh"]