这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/build-electron-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
echo "IS_BFX_API_STAGING=1" >> $GITHUB_ENV
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: electron-cache-v1
with:
Expand All @@ -64,7 +64,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
continue-on-error: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -78,14 +78,14 @@ jobs:
- name: Zip Linux Unpacked build
run: zip -r dist/linux-unpacked.zip dist/linux-unpacked
- name: Upload Linux Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-unpacked
path: dist/linux-unpacked.zip
- name: Zip Win Unpacked build
run: zip -r dist/win-unpacked.zip dist/win-unpacked
- name: Upload Win Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: win-unpacked
path: dist/win-unpacked.zip
Expand Down Expand Up @@ -124,12 +124,12 @@ jobs:
name: Use BFX API Staging for queries
run: |
echo "IS_BFX_API_STAGING=1" >> $GITHUB_ENV
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: electron-cache-v1
with:
Expand All @@ -140,7 +140,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
continue-on-error: false
env:
APPLE_TEAM_ID: ${{ secrets.BFX_APPLE_TEAM_ID }}
Expand All @@ -167,7 +167,7 @@ jobs:
- name: Zip Mac Unpacked build
run: zip -r dist/mac.zip dist/mac
- name: Upload Mac Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mac-unpacked
path: dist/mac.zip
Expand All @@ -180,20 +180,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Linux Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: linux-unpacked
path: dist
- name: Unzip Linux Unpacked build
run: unzip dist/linux-unpacked.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
Expand All @@ -212,20 +212,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Linux Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: win-unpacked
path: dist
- name: Unzip Win Unpacked build
run: 7z -y x dist/win-unpacked.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
Expand All @@ -246,20 +246,20 @@ jobs:
uses: actions/checkout@v4
- name: Prepare Mac runner
uses: ./.github/actions/prepare-mac-runner
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Mac Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: mac-unpacked
path: dist
- name: Unzip Mac Unpacked build
run: unzip dist/mac.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Setup configs and install deps
Expand Down
8 changes: 4 additions & 4 deletions scripts/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ fi
if [ $isAutoUpdateDisabled == 1 ]; then
echo -e "\n${COLOR_YELLOW}Auto-update is turned off!${COLOR_NORMAL}"

sed -i -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": .*/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
sed -i -E -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
"$ROOT/$ELECTRON_ENV_FILE_NAME"
else
sed -i -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": .*/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
sed -i -E -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
"$ROOT/$ELECTRON_ENV_FILE_NAME"
fi

Expand Down
8 changes: 4 additions & 4 deletions scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ fi
if [ $isAutoUpdateDisabled == 1 ]; then
echo -e "\n${COLOR_YELLOW}Auto-update is turned off!${COLOR_NORMAL}"

sed -i -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": .*/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
sed -i -E -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": true/g" \
"$ROOT/$ELECTRON_ENV_FILE_NAME"
else
sed -i -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": .*/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
sed -i -E -e \
"s/\"IS_AUTO_UPDATE_DISABLED\": (false)|(true)/\"IS_AUTO_UPDATE_DISABLED\": false/g" \
"$ROOT/$ELECTRON_ENV_FILE_NAME"
fi

Expand Down