diff --git a/.github/workflows/ccpp.yml b/.github/workflows/pr.yml similarity index 84% rename from .github/workflows/ccpp.yml rename to .github/workflows/pr.yml index a13fc675..ab5a00c1 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/pr.yml @@ -1,12 +1,10 @@ -name: C/C++ CI +name: CI PR -on: [pull_request, push] +on: [pull_request] jobs: build: - - runs-on: ubuntu-latest - + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: chmod diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 00000000..d4a34454 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,22 @@ +name: CI Push + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: chmod + run: chmod +x build.sh + - name: translation + run: | + cd Translation\ Editor + python3 make_translation.py + - name: make + run: ./build.sh -l EN + - name: Archive production artifacts + uses: actions/upload-artifact@v1 + with: + name: compiled + path: ci/artefacts diff --git a/workspace/TS100/Makefile b/workspace/TS100/Makefile index 75dfc3a0..f3eaf5d8 100644 --- a/workspace/TS100/Makefile +++ b/workspace/TS100/Makefile @@ -35,7 +35,7 @@ INC_PD_DRIVERS_DIR = ./Core/Drivers/FUSB302 SOURCE_MIDDLEWARES_DIR = ./Middlewares # Device dependent settings -ifeq ($(model),$(filter $(model),TS100 TS80)) +ifeq ($(model),$(filter $(model),TS100 TS80 TS80P)) $(info Building for Miniware ) DEVICE_INCLUDES = -I$(MINIWARE_INC_DIR) \ -I$(INC_CMSIS_DEVICE)\ @@ -116,7 +116,7 @@ LIBS= COMPILER=gcc # arm-none-eabi is the general ARM compiler, #riscv-none-embed- is the riscv compiler -ifeq ($(model),$(filter $(model),TS100 TS80)) +ifeq ($(model),$(filter $(model),TS100 TS80 TS80P)) COMPILER_PREFIX=arm-none-eabi endif ifeq ($(model),Pinecil) @@ -137,7 +137,7 @@ ifeq ($(model),Pinecil) AS=$(COMPILER_PREFIX)-gcc -x assembler-with-cpp endif # compiler flags --------------------------------------------------------------- -ifeq ($(model),$(filter $(model),TS100 TS80)) +ifeq ($(model),$(filter $(model),TS100 TS80 TS80P)) CPUFLAGS= -mthumb \ -mcpu=cortex-m3 \ -mfloat-abi=soft