Merge remote-tracking branch 'origin/dev' into flake8-datetimez

# Conflicts: # poetry.lock
stakewise · Jan 22, 2024 · 185a4b1 · 185a4b1
2 parents d299a0c + 35b7bfc
commit 185a4b1
Show file tree

Hide file tree

Showing 16 changed files with 996 additions and 974 deletions.
diff --git a/.env.example b/.env.example
@@ -68,3 +68,8 @@ CONSENSUS_ENDPOINTS=http://localhost:3500
 # HOT_WALLET_FILE=/home/user/.stakewise/${VAULT_CONTRACT_ADDRESS}/wallet/wallet.json
 # Default is ${DATA_DIR}/${VAULT_CONTRACT_ADDRESS}/wallet/password.txt
 # HOT_WALLET_PASSWORD_FILE=/home/user/.stakewise/${VAULT_CONTRACT_ADDRESS}/wallet/password.txt
+
+# Log level
+# LOG_LEVEL=INFO
+# Log record format. Can be "plain" or "json". Default is "plain"
+# LOG_FORMAT=plain
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -26,11 +26,11 @@ jobs:
               cp ${BUILD_FILE_NAME}.tar.gz /tmp/artifacts;
               sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256;
 
-          - OS: macos-11
+          - OS: self-hosted
             PYTHON_VERSION: 3.10.13
             BUILD_CMD: |
               export PYTHONHASHSEED=42
-              export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-darwin-amd64;
+              export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-linux-arm64;
               mkdir ${BUILD_FILE_NAME};
               git rev-parse --short HEAD > GIT_SHA
               poetry run pyinstaller \
@@ -39,6 +39,21 @@ jobs:
               tar -zcvf ${BUILD_FILE_NAME}.tar.gz ${BUILD_FILE_NAME};
               mkdir /tmp/artifacts;
               cp ${BUILD_FILE_NAME}.tar.gz /tmp/artifacts;
+              sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256;
+
+          - OS: macos-11
+            PYTHON_VERSION: 3.10.13
+            BUILD_CMD: |
+              export PYTHONHASHSEED=42
+              export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-darwin-amd64;
+              mkdir ${BUILD_FILE_NAME};
+              git rev-parse --short HEAD > GIT_SHA
+              poetry run pyinstaller \
+                --distpath ./${BUILD_FILE_NAME} \
+                ./operator.spec;
+              tar -zcvf ${BUILD_FILE_NAME}.tar.gz ${BUILD_FILE_NAME};
+              mkdir /tmp/artifacts || true;
+              cp -f ${BUILD_FILE_NAME}.tar.gz /tmp/artifacts;
               shasum -a 256 ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256
 
           - OS: windows-latest
@@ -64,11 +79,13 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
+        if: matrix.os != 'self-hosted'
 
       - name: Install Poetry
         uses: Gr1N/setup-poetry@v8
         with:
           poetry-version: "1.6.1"
+        if: matrix.os != 'self-hosted'
 
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
@@ -113,6 +130,8 @@ jobs:
           files: |
             /tmp/artifacts/ubuntu-20.04/operator-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
             /tmp/artifacts/ubuntu-20.04/operator-${{ steps.get_version.outputs.VERSION }}-linux-amd64.sha256
+            /tmp/artifacts/self-hosted/operator-${{ steps.get_version.outputs.VERSION }}-linux-arm64.tar.gz
+            /tmp/artifacts/self-hosted/operator-${{ steps.get_version.outputs.VERSION }}-linux-arm64.sha256
             /tmp/artifacts/macos-11/operator-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
             /tmp/artifacts/macos-11/operator-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.sha256
             /tmp/artifacts/windows-latest/operator-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip