Fix github workflow

Signed-off-by: Miguel Angel Ajo Pelayo <[email protected]>
jumpstarter-dev · Jan 5, 2024 · 9874cf9 · 9874cf9
1 parent fb437e7
commit 9874cf9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
@@ -9,17 +9,17 @@ jobs:
       - run: sudo apt-get install -y make podman
       - name: Setup the builder image
         run: |
-          cd firmware/bootloader
+          cd bootloader
           make .build-container
       - name: Build the firmware
         run: |
-          cd firmware/bootloader
+          cd bootloader
           make in-container
       - name: Archive resulting bootloader
         uses: actions/upload-artifact@v3
         with:
           name: jumpstarter-bootloader-dfu.bin
-          path: firmware/bootloader/dfu-bootloader.bin
+          path: bootloader/dfu-bootloader.bin
 
   application-build:
     runs-on: ubuntu-latest
@@ -29,15 +29,15 @@ jobs:
       - run: sudo apt-get install -y make podman
       - name: Setup the builder image
         run: |
-          cd firmware/application
+          cd application
           make .build-container
       - name: Build the firmware
         run: |
-          cd firmware/application
+          cd application
           make in-container
       - name: Archive resulting application
         uses: actions/upload-artifact@v3
         with:
           name: jumpstarter-main.cab 
-          path: firmware/application/jumpstarter*
+          path: application/jumpstarter*
 
diff --git a/application/Makefile b/application/Makefile
@@ -86,7 +86,7 @@ clean:
 	touch .build-container
 
 firmware-builder: .build-container
-	podman run -ti --rm -v $(CURDIR)/../../:/workdir -w /workdir/firmware/application firmware-builder bash
+	podman run -ti --rm -v $(CURDIR)/../:/workdir -w /workdir/application firmware-builder bash
 
 in-container: .build-container
-	podman run -ti --rm -v $(CURDIR)/../../:/workdir -w /workdir/firmware/application firmware-builder make $(THIS)
+	podman run -ti --rm -v $(CURDIR)/../:/workdir -w /workdir/application firmware-builder make $(THIS)
diff --git a/bootloader/Makefile b/bootloader/Makefile
@@ -48,9 +48,9 @@ clean:
 	touch .build-container
 
 firmware-builder: .build-container
-	podman run -ti --rm -v $(CURDIR)/../../:/workdir -w /workdir/firmware/bootloader firmware-builder bash
+	podman run -ti --rm -v $(CURDIR)/../:/workdir -w /workdir/bootloader firmware-builder bash
 
 in-container: .build-container
-	podman run -ti --rm -v $(CURDIR)/../../:/workdir -w /workdir/firmware/bootloader firmware-builder make $(THIS)
+	podman run -ti --rm -v $(CURDIR)/../:/workdir -w /workdir/bootloader firmware-builder make $(THIS)
 
 .PHONY: clean all flash openocd