feat: ✨ Standardize github action build flow between platforms

fairdataihub · Aug 8, 2023 · 61ddec6 · 61ddec6
1 parent e22eb8e
commit 61ddec6
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 9 deletions.
diff --git a/.github/workflows/Build-and-deploy-linux.yml b/.github/workflows/Build-and-deploy-linux.yml
@@ -23,8 +23,10 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           activate-environment: env-electron-python
           environment-file: tools/anaconda-env/environment-Linux.yml
+          auto-update-conda: true
           auto-activate-base: false
       - run: |
           conda info
@@ -37,9 +39,36 @@ jobs:
       - name: Install package.json modules and their dependencies
         run: npm install --ignore-scripts
 
-      - name: Build and deploy on Linux
+      - name: Build the python server executable
+        run: |
+          npm run python-onefile-build-unix
+
+      - name: Test the python server executable
+        run: |
+          # Run the executable in the background
+          ./pyflaskdist/app.exe 4242 > server_output.txt 2>&1 &
+
+          # Wait for the server to start
+          sleep 30
+
+          # Display the server output
+          cat server_output.txt
+
+          # Check the server output for the "Running on" line
+          if grep -q "Running on http://127.0.0.1:4242/" server_output.txt; then
+            echo "Server started successfully."
+          else
+            echo "Error: Server failed to start."
+            # You can perform additional error handling or cleanup here if needed
+            # For example, you may want to exit the workflow with an error code
+            exit 1
+          fi
+
+          # Clean up the temporary output file
+          rm server_output.txt
+
+      - name: Deploy the application
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          npm run python-onefile-build
           npm run deploy-linux
diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml
@@ -23,8 +23,10 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           activate-environment: env-electron-python
           environment-file: tools/anaconda-env/environment-MAC.yml
+          auto-update-conda: true
           auto-activate-base: false
       - run: |
           conda info
@@ -42,11 +44,36 @@ jobs:
           p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
           p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
 
-      - name: Build and deploy on MAC
+      - name: Build the python server executable
+        run: |
+          npm run python-onefile-build-unix
+
+      - name: Test the python server executable
+        run: |
+          # Run the executable in the background
+          ./pyflaskdist/app.exe 4242 > server_output.txt 2>&1 &
+
+          # Wait for the server to start
+          sleep 30
+
+          # Display the server output
+          cat server_output.txt
+
+          # Check the server output for the "Running on" line
+          if grep -q "Running on http://127.0.0.1:4242/" server_output.txt; then
+            echo "Server started successfully."
+          else
+            echo "Error: Server failed to start."
+            # You can perform additional error handling or cleanup here if needed
+            # For example, you may want to exit the workflow with an error code
+            exit 1
+          fi
+
+          # Clean up the temporary output file
+          rm server_output.txt
+
+      - name: Deploy the application
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          appleId: ${{ secrets.APPLE_ID }}
-          appleIdPassword: ${{ secrets.APPLE_PASSWORD }}
         run: |
-          npm run python-onefile-build
           npm run deploy-mac
diff --git a/.github/workflows/Build-and-deploy-win.yml b/.github/workflows/Build-and-deploy-win.yml
@@ -16,6 +16,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9
@@ -28,7 +29,6 @@ jobs:
           auto-update-conda: true
           auto-activate-base: false
       - run: |
-          conda activate env-electron-python
           conda info
           conda list
 
@@ -41,7 +41,7 @@ jobs:
 
       - name: Build the python server executable
         run: |
-          npm run python-onefile-build
+          npm run python-onefile-build-win
 
       - name: Test the python server executable
         run: |

diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "deploy-win": "electron-builder build --win --publish always",
     "deploy-mac": "electron-builder build --mac --publish always",
     "deploy-linux": "electron-builder build --linux --publish always",
-    "python-onefile-build": "python -m PyInstaller --onefile --add-data libcrypto-1_1-x64.dll;. --add-data libssl-1_1-x64.dll;. --clean ./pyflask/app.py --distpath ./pyflaskdist",
+    "python-onefile-build-unix": "python -m PyInstaller --onefile --clean ./pyflask/app.py --distpath ./pyflaskdist",
+    "python-onefile-build-win": "python -m PyInstaller --onefile --add-data libcrypto-1_1-x64.dll;. --add-data libssl-1_1-x64.dll;. --clean ./pyflask/app.py --distpath ./pyflaskdist",
     "postinstall": "electron-builder install-app-deps",
     "format": "prettier --ignore-path .gitignore --ignore-path .prettierignore \"./**/*.+(html|css|js|md|yml)\" --write",
     "commit": "cz",