diff --git a/.github/workflows/build-electron-app.yml b/.github/workflows/build-electron-app.yml index fe669ff9..52a58eb8 100644 --- a/.github/workflows/build-electron-app.yml +++ b/.github/workflows/build-electron-app.yml @@ -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: @@ -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 }} @@ -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 @@ -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: @@ -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 }} @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4154b2e..acf4b350 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/scripts/build-release.sh b/scripts/build-release.sh index 3862083b..27f93e1d 100755 --- a/scripts/build-release.sh +++ b/scripts/build-release.sh @@ -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 diff --git a/scripts/setup.sh b/scripts/setup.sh index f8c77105..62f1f3a8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -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