forked from CringeStudios/element-desktop
wait til after deps install
This commit is contained in:
parent
f2319fc173
commit
0fc37c929a
30
.github/workflows/build_windows.yaml
vendored
30
.github/workflows/build_windows.yaml
vendored
@ -67,21 +67,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: webapp
|
name: webapp
|
||||||
|
|
||||||
- name: Insert config snippet
|
|
||||||
if: steps.config.outputs.extra_config != ''
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir config-edit
|
|
||||||
yarn asar extract webapp.asar config-edit
|
|
||||||
cd config-edit
|
|
||||||
mv config.json old-config.json
|
|
||||||
echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json
|
|
||||||
rm old-config.json
|
|
||||||
cd ..
|
|
||||||
rm webapp.asar
|
|
||||||
yarn asar pack config-edit/ webpack.asar
|
|
||||||
|
|
||||||
|
|
||||||
- name: Cache .hak
|
- name: Cache .hak
|
||||||
id: cache
|
id: cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
@ -121,6 +106,21 @@ jobs:
|
|||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
run: "yarn install --frozen-lockfile"
|
run: "yarn install --frozen-lockfile"
|
||||||
|
|
||||||
|
- name: Insert config snippet
|
||||||
|
if: steps.config.outputs.extra_config != ''
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
mkdir config-edit
|
||||||
|
yarn asar extract webapp.asar config-edit
|
||||||
|
cd config-edit
|
||||||
|
mv config.json old-config.json
|
||||||
|
echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json
|
||||||
|
rm old-config.json
|
||||||
|
cd ..
|
||||||
|
rm webapp.asar
|
||||||
|
yarn asar pack config-edit/ webpack.asar
|
||||||
|
|
||||||
|
|
||||||
- name: Set up sqlcipher macros
|
- name: Set up sqlcipher macros
|
||||||
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm')
|
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm')
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
Loading…
x
Reference in New Issue
Block a user