updated workflow

2024-11-21 18:53:24 +00:00 · 2024-04-02 18:42:55 +02:00 · 2024-04-02 18:42:55 +02:00 · c26afbadae
commit c26afbadae
parent 8041627ca3
13 changed files with 4 additions and 4 deletions
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@ -24,4 +24,4 @@ jobs:

    - name: build
      working-directory: ./numworks_port
-      run: make
+      run: make RUN_IN_GITHUB_ACTION=TRUE
--- a/numworks_port/Makefile
+++ b/numworks_port/Makefile
@ -9,10 +9,10 @@ LD_SCRIPT = $(SRC_DIR)/linker.ld
 MCU_SPEC  = cortex-m7

 # Toolchain definitions (ARM bare metal defaults)
-ifeq ($(RUN_IN_GITHUB_ACTION),"TRUE")
-TOOLCHAIN = $(ARM_NONE_EABI_GCC_PATH)
+ifndef RUN_IN_GITHUB_ACTION
+TOOLCHAIN = /usr/bin# if make is run normally
 else
-TOOLCHAIN = /usr/bin
+TOOLCHAIN = $(ARM_NONE_EABI_GCC_PATH) # if run inside of a github action
 endif

 CP = $(TOOLCHAIN)/arm-none-eabi-g++
--- a/numworks_port/build/Laplace/gpio_helper.o
+++ b/numworks_port/build/Laplace/gpio_helper.o
--- a/numworks_port/build/Laplace/keyboard.o
+++ b/numworks_port/build/Laplace/keyboard.o
--- a/numworks_port/build/Laplace/laplace.o
+++ b/numworks_port/build/Laplace/laplace.o
--- a/numworks_port/build/Laplace/led.o
+++ b/numworks_port/build/Laplace/led.o
--- a/numworks_port/build/Laplace/time.o
+++ b/numworks_port/build/Laplace/time.o
--- a/numworks_port/build/info_headers.o
+++ b/numworks_port/build/info_headers.o
--- a/numworks_port/build/main.bin
+++ b/numworks_port/build/main.bin
--- a/numworks_port/build/main.elf
+++ b/numworks_port/build/main.elf
--- a/numworks_port/build/main.o
+++ b/numworks_port/build/main.o
--- a/numworks_port/build/start_handler.o
+++ b/numworks_port/build/start_handler.o
--- a/numworks_port/build/vector_table.o
+++ b/numworks_port/build/vector_table.o