Merge pull request #47 from lukso-network/fix/new-merge-patch

fix: Patch merge with latest CLI
lukso-network · Aug 11, 2023 · aab1777 · aab1777
2 parents 67509cc + 4404ebf
commit aab1777
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -45,7 +45,7 @@ jobs:
         if: ${{ matrix.os != 'macos' }}
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10.11"
+          python-version: "3.11.4"
       - name: Set up Python (mac)
         if: ${{ matrix.os == 'macos' }}
         uses: actions/setup-python@v4
@@ -59,8 +59,7 @@ jobs:
         if: ${{ matrix.os == 'linux' }}
         run: |
           corepack enable
-          pip3 install -r src/vendors/tools-key-gen-cli/requirements.txt
-          pip3 install pyinstaller
+          pip3 install -r src/vendors/tools-key-gen-cli/build_configs/linux/requirements.txt
           yarn install
           yarn build
           yarn buildcli
@@ -75,8 +74,7 @@ jobs:
         if: ${{ matrix.os == 'windows' }}
         run: |
           corepack enable
-          pip3 install -r src/vendors/tools-key-gen-cli/requirements.txt
-          pip3 install pyinstaller
+          pip3 install -r src/vendors/tools-key-gen-cli/build_configs/windows/requirements.txt
           yarn install
           yarn build
           yarn buildcliwin

diff --git a/src/scripts/bundle_proxy_mac.sh b/src/scripts/bundle_proxy_mac.sh
@@ -17,8 +17,9 @@ TARGETPACKAGESMACPATH=$SCRIPTPATH/../../dist/packages.mac
 ETH2DEPOSITCLIPATH=$SCRIPTPATH/../vendors/$EDCDIR
 ETH2REQUIREMENTSPATH=$ETH2DEPOSITCLIPATH/requirements.txt
 
-PYTHONPATH=$TARGETPACKAGESMACPATH:$TARGETPACKAGESPATH:$ETH2DEPOSITCLIPATH:$(python3 -c "import sys;print(':'.join(sys.path))")
+export PYTHONPATH=$TARGETPACKAGESMACPATH:$TARGETPACKAGESPATH:$ETH2DEPOSITCLIPATH:$(python3 -c "import sys;print(':'.join(sys.path))")
 echo $PYTHONPATH
+export PATH=$TARGETPACKAGESMACPATH/bin:$PATH
 DISTBINPATH=$SCRIPTPATH/../../build/bin
 DISTWORDSPATH=$SCRIPTPATH/../../build/word_lists
 SRCWORDSPATH=$SCRIPTPATH/../vendors/$EDCDIR/staking_deposit/key_handling/key_derivation/word_lists
@@ -45,22 +46,23 @@ VERSION=$(sed -n -e 's#\(pycryptodome==[^ ]*\).*#\1#gp' $ETH2REQUIREMENTSPATH)
 echo $VERSION
 
 python3 -m pip install pip -U
-python3 -m pip install cython --no-binary :all: --target $TARGETPACKAGESMACPATH
+
+python3 -m pip install -U cython==0.29.33 --no-binary :all: --target $TARGETPACKAGESMACPATH
 python3 -m pip install $VERSION --no-binary :all: --target $TARGETPACKAGESMACPATH
 python3 -m pip install cytoolz==0.12.1 --no-binary :all: --target $TARGETPACKAGESMACPATH
 python3 -m pip install -r ./src/vendors/tools-key-gen-cli/build_configs/macos/requirements.txt --target $TARGETPACKAGESMACPATH
 python3 -m pip install -r ./src/vendors/tools-key-gen-cli/build_configs/macos/requirements.pyinstaller.txt --target $TARGETPACKAGESMACPATH
 python3 -m pip install -r $ETH2REQUIREMENTSPATH --target $TARGETPACKAGESPATH --no-deps
-python3 -m pip install pyinstaller --target $TARGETPACKAGESPATH
+python3 -m pip install -U pyinstaller==5.9.0 --target $TARGETPACKAGESPATH
 
 # Bundling Python stakingdeposit_proxy
-PYTHONPATH=$PYTHONPATH pyinstaller \
+pyinstaller \
     --distpath $DISTX64PATH \
     --target-arch x86_64 \
     --add-data "$SRCINTLPATH:staking_deposit/intl" \
     -p $PYTHONPATH \
     $SCRIPTPATH/stakingdeposit_proxy.py
-PYTHONPATH=$PYTHONPATH pyinstaller \
+pyinstaller \
     --distpath $DISTARMPATH \
     --target-arch arm64 \
     --add-data "$SRCINTLPATH:staking_deposit/intl" \