diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 7e787a7..fd467ce 100644 --- 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 diff --git a/numworks_port/Makefile b/numworks_port/Makefile index 87ab9ad..2149358 100644 --- 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++ diff --git a/numworks_port/build/Laplace/gpio_helper.o b/numworks_port/build/Laplace/gpio_helper.o deleted file mode 100644 index 3a0b959..0000000 Binary files a/numworks_port/build/Laplace/gpio_helper.o and /dev/null differ diff --git a/numworks_port/build/Laplace/keyboard.o b/numworks_port/build/Laplace/keyboard.o deleted file mode 100644 index 224bddf..0000000 Binary files a/numworks_port/build/Laplace/keyboard.o and /dev/null differ diff --git a/numworks_port/build/Laplace/laplace.o b/numworks_port/build/Laplace/laplace.o deleted file mode 100644 index 2cb6cb8..0000000 Binary files a/numworks_port/build/Laplace/laplace.o and /dev/null differ diff --git a/numworks_port/build/Laplace/led.o b/numworks_port/build/Laplace/led.o deleted file mode 100644 index 6284c55..0000000 Binary files a/numworks_port/build/Laplace/led.o and /dev/null differ diff --git a/numworks_port/build/Laplace/time.o b/numworks_port/build/Laplace/time.o deleted file mode 100644 index 1c566c5..0000000 Binary files a/numworks_port/build/Laplace/time.o and /dev/null differ diff --git a/numworks_port/build/info_headers.o b/numworks_port/build/info_headers.o deleted file mode 100644 index e6000dc..0000000 Binary files a/numworks_port/build/info_headers.o and /dev/null differ diff --git a/numworks_port/build/main.bin b/numworks_port/build/main.bin deleted file mode 100755 index db693a4..0000000 Binary files a/numworks_port/build/main.bin and /dev/null differ diff --git a/numworks_port/build/main.elf b/numworks_port/build/main.elf deleted file mode 100755 index efdedea..0000000 Binary files a/numworks_port/build/main.elf and /dev/null differ diff --git a/numworks_port/build/main.o b/numworks_port/build/main.o deleted file mode 100644 index 00bb825..0000000 Binary files a/numworks_port/build/main.o and /dev/null differ diff --git a/numworks_port/build/start_handler.o b/numworks_port/build/start_handler.o deleted file mode 100644 index 5ffb610..0000000 Binary files a/numworks_port/build/start_handler.o and /dev/null differ diff --git a/numworks_port/build/vector_table.o b/numworks_port/build/vector_table.o deleted file mode 100644 index 2568546..0000000 Binary files a/numworks_port/build/vector_table.o and /dev/null differ