Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop doing cross builds and increase network timeout #535

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Stop doing cross builds and increase network timeout #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions .github/workflows/package-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
os: [macos-latest, ubuntu-latest]
os: [windows-latest, macos-latest, ubuntu-latest]
dotnet_version: [7.0.x]
node_version: [18.x]

Expand All @@ -44,6 +44,7 @@ jobs:
npm run build

- name: Update release version
shell: bash
run: |
COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
cd ./release/app
Expand All @@ -52,11 +53,12 @@ jobs:
echo "Updating version from ${CURRENT_VERSION} to ${NEW_VERSION}"
npm version $NEW_VERSION

- name: dotnet build - Windows on macOS
if: ${{ matrix.os == 'macos-latest' }}
run: npm run build:data-release:windows
- name: Publish releases - Windows
if: ${{ matrix.os == 'windows-latest' }}
run: |
npm exec electron-builder -- build --publish never --win

- name: Publish releases - Windows and macOS
- name: Publish releases - macOS
if: ${{ matrix.os == 'macos-latest' }}
# env:
# # These values are used for auto updates signing
Expand All @@ -65,7 +67,7 @@ jobs:
# CSC_LINK: ${{ secrets.CSC_LINK }}
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
run: |
npm exec electron-builder -- build --publish never --win --mac
npm exec electron-builder -- build --publish never --mac

- name: Publish releases - Linux
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand All @@ -75,22 +77,22 @@ jobs:
run: |
npm exec electron-builder -- build --publish never --linux

- name: Upload macOS artifacts
if: ${{ matrix.os == 'macos-latest' }}
- name: Upload Windows artifacts
if: ${{ matrix.os == 'windows-latest' }}
uses: actions/upload-artifact@v3
with:
name: app-macos
name: app-windows
path: |
./release/build/*.dmg
./release/build/*.exe
!./release/build/*Setup*.exe

- name: Upload Windows artifacts
- name: Upload macOS artifacts
if: ${{ matrix.os == 'macos-latest' }}
uses: actions/upload-artifact@v3
with:
name: app-windows
name: app-macos
path: |
./release/build/*.exe
!./release/build/*Setup*.exe
./release/build/*.dmg

- name: Upload Linux artifacts
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/services/network.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ const requestRawUnsafe = async <TParam, TReturn>(
// If the request type doesn't have a registered handler yet, retry a few times to help with race conditions
// This approach is hacky but works well enough for now
const expectedErrorMsg: string = `No handler was found to process the request of type ${requestType}`;
const maxAttempts: number = globalThis.isPackaged ? 5 : 10;
const maxAttempts: number = 10;
for (let attemptsRemaining = maxAttempts; attemptsRemaining > 0; attemptsRemaining--) {
// eslint-disable-next-line no-await-in-loop
const response = await connectionService.request<TParam, TReturn>(requestType, contents);
Expand Down