From a3e91fd3ffa6bfa5f0ba10f15f1332425d08cac7 Mon Sep 17 00:00:00 2001 From: Quentin Date: Tue, 7 Apr 2020 15:01:44 +0200 Subject: [PATCH] [Fix] Fix conflicts ._. --- .github/workflows/ci-workflow.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index f7cc179b3..a67660ad2 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -9,8 +9,6 @@ jobs: with: submodules: true - run: make -j2 PLATFORM=simulator TARGET=android - - run: make -j2 PLATFORM=simulator TARGET=android epsilon.official.apk - - run: make -j2 PLATFORM=simulator TARGET=android test.apk - uses: actions/upload-artifact@master with: name: epsilon-android.apk @@ -29,7 +27,6 @@ jobs: - run: make -j2 MODEL=n0100 epsilon.onboarding.beta.dfu - run: make -j2 MODEL=n0100 flasher.light.dfu - run: make -j2 MODEL=n0100 flasher.verbose.dfu - - run: make -j2 MODEL=n0100 test.elf - uses: actions/upload-artifact@master with: name: epsilon-n0100.dfu @@ -50,7 +47,6 @@ jobs: - run: make -j2 flasher.verbose.dfu - run: make -j2 bench.ram.dfu - run: make -j2 bench.flash.dfu - - run: make -j2 test.elf - uses: actions/upload-artifact@master with: name: epsilon-n0110.dfu @@ -77,11 +73,8 @@ jobs: with: submodules: true - run: make -j2 PLATFORM=simulator - - run: make -j2 PLATFORM=simulator epsilon.official.bin - - run: make -j2 PLATFORM=simulator test.headless.bin - - run: output/release/simulator/linux/test.headless.bin - uses: actions/upload-artifact@master with: name: epsilon-linux.bin path: output/release/simulator/linux/epsilon.bin - - run: make -j2 PLATFORM=simulator test.headless.bin + - run: make -j2 PLATFORM=simulator test.headless.bin \ No newline at end of file