Update release pipeline

sco1 · Jan 12, 2025 · 47df049 · 47df049
1 parent 1d45a9c
commit 47df049
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 18 deletions.
diff --git a/.github/workflows/release_artifacts.yml b/.github/workflows/release_artifacts.yml
@@ -19,36 +19,85 @@ jobs:
       with:
         python-version-file: "pyproject.toml"
 
-    - name: Compile skyportal lib
-      run: |
-        python ./compile.py
-
     - name: Build base bundle
       run: |
         tar -cvf bundle_base.tar \
-          ./assets/*             \
-          ./lib/*                \
           ./boot.py              \
           ./code.py              \
-          ./pyportal_startup.bmp \
-          ./pyportal_startup.wav \
           ./secrets.py           \
           ./skyportal_config.py
 
-    - name: Create non-compiled bundle
+    - name: Build PyPortal bundle base
+      run: |
+        mkdir -p ./tmp/assets
+        cp ./assets/* ./tmp/assets
+        cp ./tmp/assets/default_map_pyportal.bmp ./tmp/assets/default_map.bmp
+        rm ./tmp/assets/default_map_*.bmp
+
+        mkdir -p ./tmp/lib
+        cp -r ./lib_by_platform/pyportal/lib/* ./tmp/lib
+
+        cp ./pyportal_startup.bmp .
+        cp ./pyportal_startup.wav .
+
+        cp bundle_base.tar pyportal_bundle_base.tar
+        tar -rvf pyportal_bundle_base.tar -C ./tmp/ .
+
+    - name: Create non-compiled PyPortal bundle
+      run: |
+        cp pyportal_bundle_base.tar skyportal_bundle_pyportal.tar
+        tar -rvf skyportal_bundle_pyportal.tar ./skyportal/*
+        tar -vf skyportal_bundle_pyportal.tar --delete ./skyportal/feather_compat.py
+        gzip skyportal_bundle_pyportal.tar
+
+    - name: Compile skyportal lib for PyPortal
+      run: |
+        python ./compile.py pyportal
+
+    - name: Create compiled PyPortal bundle
+      run: |
+        cp pyportal_bundle_base.tar skyportal_bundle_pyportal_compiled.tar
+        tar -rvf skyportal_bundle_pyportal_compiled.tar -C ./dist/ .
+        gzip skyportal_bundle_pyportal_compiled.tar
+
+    - name: PyPortal Cleanup
+      run: |
+        rm -rf ./tmp
+        rm -rf ./dist
+        rm -f pyportal_bundle_base.tar
+
+    - name: Build Feather bundle base
+      run: |
+        mkdir -p ./tmp/assets
+        cp ./assets/* ./tmp/assets
+        cp ./tmp/assets/default_map_featherS3.bmp ./tmp/assets/default_map.bmp
+        rm ./tmp/assets/default_map_*.bmp
+
+        mkdir -p ./tmp/lib
+        cp -r ./lib_by_platform/featherS3/lib/* ./tmp/lib
+
+        cp bundle_base.tar feather_bundle_base.tar
+        tar -rvf feather_bundle_base.tar -C ./tmp/ .
+
+    - name: Create non-compiled FeatherS3 bundle
+      run: |
+        cp feather_bundle_base.tar skyportal_bundle_feather.tar
+        tar -rvf skyportal_bundle_feather.tar ./skyportal/*
+        tar -vf skyportal_bundle_feather.tar --delete ./skyportal/pyportal_compat.py
+        gzip skyportal_bundle_feather.tar
+
+    - name: Compile skyportal lib for FeatherS3
       run: |
-        cp bundle_base.tar skyportal_bundle.tar
-        tar -rvf skyportal_bundle.tar ./skyportal/*
-        gzip skyportal_bundle.tar
+        python ./compile.py feather
 
-    - name: Create compiled bundle
+    - name: Create compiled FeatherS3 bundle
       run: |
-        cp bundle_base.tar skyportal_bundle_compiled.tar
-        tar -rvf skyportal_bundle_compiled.tar -C ./dist/ .
-        gzip skyportal_bundle_compiled.tar
+        cp feather_bundle_base.tar skyportal_bundle_feather_compiled.tar
+        tar -rvf skyportal_bundle_feather_compiled.tar -C ./dist/ .
+        gzip skyportal_bundle_feather_compiled.tar
 
     - name: Upload artifacts
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run:
-        gh release upload ${{ github.event.release.tag_name }} skyportal_bundle.tar.gz skyportal_bundle_compiled.tar.gz
+        gh release upload ${{ github.event.release.tag_name }} skyportal_bundle_*.tar.gz
diff --git a/compile.py b/compile.py
@@ -1,3 +1,4 @@
+import argparse
 import platform
 import subprocess
 import time
@@ -14,9 +15,19 @@
 
 
 if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("target", type=str, choices=("pyportal", "feather"))
+    args = parser.parse_args()
+
     DEST_DIR.mkdir(parents=True, exist_ok=True)
 
-    to_compile = list(SOURCE_DIR.glob("*.py"))
+    # Remove unnecessary compatibility layer
+    to_compile = set(SOURCE_DIR.glob("*.py"))
+    if args.target == "pyportal":
+        to_compile.remove(SOURCE_DIR / "feather_compat.py")
+    elif args.target == "feather":
+        to_compile.remove(SOURCE_DIR / "pyportal_compat.py")
+
     print(f"Found {len(to_compile)} *.py files to compile")
     for filepath in to_compile:
         subprocess.run([COMPILERS[platform.system()], filepath])