Add Initial Mirage Node Type Support with Dedicated Configuration and Refined Init Checks

.github/workflows/publish.yml

@@ -20,12 +20,12 @@ jobs:
       branch: ${{ steps.export_outputs.outputs.branch }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Checkout submodules
-        run: git submodule update --init
+        run: git submodule update --init --recursive
 
       - name: Install ubuntu dependencies
         run: |
@@ -55,126 +55,84 @@ jobs:
           release_name: ${{ env.VERSION }}
           draft: false
           prerelease: ${{ env.PRERELEASE }}
+
       - name: Export outputs
         id: export_outputs
         run: |
           echo "::set-output name=version::$VERSION"
           echo "::set-output name=branch::$BRANCH"
 
-  build_and_publish_normal:
-    if: github.event.pull_request.merged
-    needs: create_release
-    name: Build and publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-22.04
-            asset_name: skale-${{ needs.create_release.outputs.version }}-Linux-x86_64
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.11
-
-    - name: Install ubuntu dependencies
-      if: matrix.os == 'ubuntu-22.04'
-      run: |
-        sudo apt-get update
-
-    - name: Checkout submodules
-      run: git submodule update --init
-
-    - name: Build normal binary
-      run: |
-        mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} normal
-        ls -altr /home/ubuntu/dist/
-        docker rm -f $(docker ps -aq)
-
-    - name: Save sha512sum
-      run: |
-        sudo sha512sum /home/ubuntu/dist/${{ matrix.asset_name }} | sudo tee > /dev/null /home/ubuntu/dist/sha512sum
-
-    - name: Upload release binary
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/${{ matrix.asset_name }}
-        asset_name: ${{ matrix.asset_name }}
-        asset_content_type: application/octet-stream
-
-    - name: Upload release checksum
-      id: upload-release-checksum
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/sha512sum
-        asset_name: ${{ matrix.asset_name }}.sha512
-        asset_content_type: text/plain
-
-  build_and_publish_sync:
+  build_and_publish:
     if: github.event.pull_request.merged
     needs: create_release
-    name: Build and publish for ${{ matrix.os }}
+    name: Build and publish ${{ matrix.build_type }} for ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-          - os: ubuntu-22.04
-            asset_name: skale-${{ needs.create_release.outputs.version }}-Linux-x86_64-sync
+        os: [ubuntu-22.04] 
+        build_type: [normal, sync, mirage] 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.11
-
-    - name: Install ubuntu dependencies
-      if: matrix.os == 'ubuntu-22.04'
-      run: |
-        sudo apt-get update
-
-    - name: Checkout submodules
-      run: git submodule update --init
-
-    - name: Build sync release binary
-      run: |
-        mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} sync
-        ls -altr /home/ubuntu/dist/
-        docker rm -f $(docker ps -aq)
-
-    - name: Save sha512sum
-      run: |
-        sudo sha512sum /home/ubuntu/dist/${{ matrix.asset_name }} | sudo tee > /dev/null /home/ubuntu/dist/sha512sum
-
-    - name: Upload release sync CLI
-      id: upload-sync-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/${{ matrix.asset_name }}
-        asset_name: ${{ matrix.asset_name }}
-        asset_content_type: application/octet-stream
-
-    - name: Upload release sync CLI checksum
-      id: upload-sync-release-checksum
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/sha512sum
-        asset_name: ${{ matrix.asset_name }}.sha512
-        asset_content_type: text/plain
+      - name: Checkout code
+        uses: actions/checkout@v4 
+        with:
+          submodules: true 
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5 
+        with:
+          python-version: 3.11
+
+      - name: Install ubuntu dependencies
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+
+      - name: Ensure submodules are updated
+        run: git submodule update --init --recursive
+
+      - name: Define Asset Name
+        id: asset_details
+        run: |
+          ASSET_BASE_NAME="skale-${{ needs.create_release.outputs.version }}-Linux-x86_64"
+          if [[ "${{ matrix.build_type }}" == "normal" ]]; then
+            echo "FINAL_ASSET_NAME=${ASSET_BASE_NAME}" >> $GITHUB_OUTPUT
+          else
+            echo "FINAL_ASSET_NAME=${ASSET_BASE_NAME}-${{ matrix.build_type }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build ${{ matrix.build_type }} release binary
+        run: |
+          mkdir -p ${{ github.workspace }}/dist
+          docker build . -t node-cli-builder
+          docker run --rm -v ${{ github.workspace }}/dist:/app/dist node-cli-builder \
+            scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} ${{ matrix.build_type }}
+          echo "Contents of dist directory:"
+          ls -altr ${{ github.workspace }}/dist/
+          docker rm -f $(docker ps -aq)
+
+      - name: Save sha512sum for ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
+        run: |
+          cd ${{ github.workspace }}/dist
+          sha512sum ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }} > ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
+          echo "Checksum file created: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum"
+          cat ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
+
+      - name: Upload release binary (${{ matrix.build_type }})
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/dist/${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
+          asset_name: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
+          asset_content_type: application/octet-stream
+
+      - name: Upload release checksum (${{ matrix.build_type }})
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/dist/${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
+          asset_name: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512
+          asset_content_type: text/plain

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -e .[dev]
+        pip install -e ".[dev]"
 
     - name: Generate info
       run: ./scripts/generate_info.sh 1.0.0 my-branch normal
@@ -57,6 +57,16 @@ jobs:
     - name: Check build - sync
       run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64-sync
 
+    - name: Build binary - mirage
+      run: |
+        mkdir -p ./dist
+        docker build . -t node-cli-builder
+        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh test test mirage
+        docker rm -f $(docker ps -aq)
+
+    - name: Check build - mirage
+      run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64-mirage
+
     - name: Run prepare test build
       run: |
         scripts/build.sh test test normal

.gitignore

@@ -122,3 +122,4 @@ test-env
 nginx.conf
 tests/.skale/node_data/docker.json
 tests/.skale/node_data/node_options.json
+tests/.skale/config/nginx.conf.j2

Dockerfile

@@ -24,7 +24,6 @@ COPY . .
 ENV PATH=/app/buildvenv/bin:$PATH
 ENV PYTHONPATH="{PYTHONPATH}:/usr/lib/python3/dist-packages"
 
-RUN python3.11 -m venv /app/buildvenv && \
-    pip install --upgrade pip && \
+RUN pip install --upgrade pip && \
     pip install wheel setuptools==63.2.0 && \
     pip install -e '.[dev]'