[ci] Misc cleanups

.github/workflows/ci-workflow.yml

@@ -7,10 +7,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - 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-simulator-android.apk
-          path: output/release/simulator/android/app/outputs/apk/release/android-release-unsigned.apk
+          name: epsilon-android.apk
+          path: output/release/simulator/android/epsilon.apk
   build-device-n0100:
     runs-on: ubuntu-latest
     steps:
@@ -24,11 +26,11 @@ 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-device-n0100.dfu
+          name: epsilon-n0100.dfu
           path: output/release/device/n0100/epsilon.dfu
-      - run: make -j2 MODEL=n0100 test.elf
   build-device-n0110:
     runs-on: ubuntu-latest
     steps:
@@ -44,11 +46,11 @@ 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-device-n0110.dfu
+          name: epsilon-n0110.dfu
           path: output/release/device/n0110/epsilon.dfu
-      - run: make -j2 test.elf
   build-simulator-windows:
     runs-on: windows-latest
     steps:
@@ -56,12 +58,13 @@ jobs:
       - uses: actions/checkout@v2
       - run: msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
       - run: msys2do make -j2 PLATFORM=simulator
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-simulator-windows.exe
-          path: output/release/simulator/windows/epsilon.exe
+      - run: msys2do make -j2 PLATFORM=simulator epsilon.official.exe
       - run: msys2do make -j2 PLATFORM=simulator test.headless.exe
       - run: output\release\simulator\windows\test.headless.exe
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-windows.exe
+          path: output/release/simulator/windows/epsilon.exe
   build-simulator-web:
     runs-on: ubuntu-latest
     steps:
@@ -70,47 +73,51 @@ jobs:
           sdk: latest-fastcomp
       - uses: actions/checkout@v2
       - run: make -j2 PLATFORM=simulator TARGET=web
-      - run: make -j2 PLATFORM=simulator TARGET=web epsilon.official.js
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-simulator-web.zip
-          path: output/release/simulator/web/epsilon.zip
+      - run: make -j2 PLATFORM=simulator TARGET=web epsilon.official.zip
       - run: make -j2 PLATFORM=simulator TARGET=web test.headless.js
       - run: node output/release/simulator/web/test.headless.js
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-web.zip
+          path: output/release/simulator/web/epsilon.zip
   build-simulator-linux:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: actions/checkout@v2
       - run: make -j2 PLATFORM=simulator
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-simulator-linux.bin
-          path: output/release/simulator/linux/epsilon.bin
+      - 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
   build-simulator-macos:
     runs-on: macOS-latest
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
       - run: make -j2 PLATFORM=simulator
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-simulator-macos.zip
-          path: output/release/simulator/macos/app/Payload
+      - run: make -j2 PLATFORM=simulator epsilon.official.app
       - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.headless.bin
       - run: output/release/simulator/macos/x86_64/test.headless.bin
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-macos.zip
+          path: output/release/simulator/macos/epsilon.app
   build-simulator-ios:
     runs-on: macOS-latest
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 epsilon.official.ipa
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 test.ipa
       - uses: actions/upload-artifact@master
         with:
-          name: epsilon-simulator-ios.ipa
-          path: output/release/simulator/ios/app/epsilon.ipa
+          name: epsilon-ios.ipa
+          path: output/release/simulator/ios/epsilon.ipa
 
 env:
   ACCEPT_OFFICIAL_TOS: 1