mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-09-11 18:58:59 +03:00
Don't pull main in the usual case (#937)
* Don't pull main in the usual case * Use git to avoid setuptools_scm issues * Double check submodule git status * add js-yaml
This commit is contained in:
parent
ef482d85e9
commit
7ba15e57f2
10
.github/workflows/build-macos-installer.yml
vendored
10
.github/workflows/build-macos-installer.yml
vendored
@ -85,11 +85,11 @@ jobs:
|
|||||||
p12-password: ${{ secrets.APPLE_DEV_ID_APP_PASS }}
|
p12-password: ${{ secrets.APPLE_DEV_ID_APP_PASS }}
|
||||||
|
|
||||||
- name: Checkout GUI
|
- name: Checkout GUI
|
||||||
uses: actions/checkout@v2
|
run: |
|
||||||
with:
|
echo "Running git submodule update --init --recursive."
|
||||||
repository: 'Chia-Network/chia-blockchain-gui'
|
git submodule update --init --recursive
|
||||||
ref: 'main'
|
cd chia-blockchain-gui
|
||||||
path: './chia-blockchain-gui'
|
git status
|
||||||
|
|
||||||
- name: Run install script
|
- name: Run install script
|
||||||
env:
|
env:
|
||||||
|
@ -63,10 +63,10 @@ jobs:
|
|||||||
|
|
||||||
- name: Checkout GUI
|
- name: Checkout GUI
|
||||||
run: |
|
run: |
|
||||||
|
echo "Running git submodule update --init --recursive."
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
cd chia-blockchain-gui
|
cd chia-blockchain-gui
|
||||||
git checkout main
|
git status
|
||||||
git pull
|
|
||||||
|
|
||||||
- name: Test for secrets access
|
- name: Test for secrets access
|
||||||
id: check_secrets
|
id: check_secrets
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 65fc9a87127115ca0092e1090caf796693ab6eef
|
Subproject commit 9025c226998f696ceb1307ce1ce399c5e2106180
|
@ -58,21 +58,23 @@ fi
|
|||||||
# for Mac and Windows so skip unless completing a source/developer install
|
# for Mac and Windows so skip unless completing a source/developer install
|
||||||
# Ubuntu special cases above
|
# Ubuntu special cases above
|
||||||
if [ ! "$CI" ]; then
|
if [ ! "$CI" ]; then
|
||||||
git submodule update --init --recursive
|
|
||||||
echo "Running git submodule update --init --recursive."
|
echo "Running git submodule update --init --recursive."
|
||||||
echo ""
|
echo ""
|
||||||
cd chia-blockchain-gui
|
git submodule update --init --recursive
|
||||||
|
echo "Running git submodule update."
|
||||||
|
echo ""
|
||||||
git submodule update
|
git submodule update
|
||||||
|
cd chia-blockchain-gui
|
||||||
|
|
||||||
if [ "$SUBMODULE_BRANCH" ];
|
if [ "$SUBMODULE_BRANCH" ];
|
||||||
then
|
then
|
||||||
git checkout "$SUBMODULE_BRANCH"
|
git checkout "$SUBMODULE_BRANCH"
|
||||||
|
git pull
|
||||||
echo ""
|
echo ""
|
||||||
echo "Building the GUI with branch $SUBMODULE_BRANCH"
|
echo "Building the GUI with branch $SUBMODULE_BRANCH"
|
||||||
echo ""
|
echo ""
|
||||||
else
|
fi
|
||||||
git checkout main
|
|
||||||
fi
|
|
||||||
git pull
|
|
||||||
npm install
|
npm install
|
||||||
npm audit fix
|
npm audit fix
|
||||||
npm run locale:extract
|
npm run locale:extract
|
||||||
|
Loading…
Reference in New Issue
Block a user