Skip to content
This repository has been archived by the owner on Dec 12, 2024. It is now read-only.

Commit

Permalink
dev: get electron-reload back to work (jitsi#943)
Browse files Browse the repository at this point in the history
  • Loading branch information
csett86 authored and dom6770 committed Feb 14, 2024
1 parent 52e273e commit 6c06177
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 52 deletions.
80 changes: 28 additions & 52 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
name: CI

name: Build & Publish
run-name: Version ${{github.ref_name}}
on:
# Trigger the workflow on push or pull request,
# but only for the master branch
push:
branches:
- master
pull_request:
branches:
- master
tags:
- '*'

jobs:
build-linux:
name: Linux
name: Build Linux
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand All @@ -30,61 +25,42 @@ jobs:
with:
name: linux-binaries
path: |
dist/jitsi-meet-amd64.deb
dist/jitsi-meet-x86_64.AppImage
dist/jitsi-meet-arm64.deb
dist/jitsi-meet-arm64.AppImage
dist/jitsi-meet-sonn-amd64.deb
dist/jitsi-meet-sonn-x86_64.AppImage
dist/latest-linux.yml
dist/latest-linux-arm64.yml
build-mac:
name: macOS
runs-on: macos-11
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Prepare for app signing and notarization
env:
MAC_CERT_PASSWORD: ${{ secrets.mac_cert_password }}
if: ${{ env.MAC_CERT_PASSWORD }}
run: |
echo "CSC_LINK=${{ secrets.mac_cert }}" >> $GITHUB_ENV
echo "CSC_KEY_PASSWORD=${{ secrets.mac_cert_password }}" >> $GITHUB_ENV
echo "CSC_FOR_PULL_REQUEST=true" >> $GITHUB_ENV
echo "APPLE_ID=${{ secrets.apple_id }}" >> $GITHUB_ENV
echo "APPLE_ID_PASSWORD=${{ secrets.apple_id_password }}" >> $GITHUB_ENV
echo "TEAM_ID=${{ secrets.team_id }}" >> $GITHUB_ENV
- name: Build it
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm ci
npm run dist
- uses: actions/upload-artifact@v3
with:
name: mac-binaries
path: |
dist/jitsi-meet.dmg
dist/jitsi-meet.zip
dist/latest-mac.yml
build-windows:
name: Windows
runs-on: windows-2022
name: Build Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Build it
- name: Build package
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: |
npm ci
npm run dist
- uses: actions/upload-artifact@v3
name: Upload package
with:
name: windows-binaries
path: |
dist/jitsi-meet.exe
dist/jitsi-meet-sonn-installer.exe
dist/latest.yml
create-release:
name: Create GitHub Release
needs: [build-linux, build-windows]
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: ncipollo/release-action@v1
with:
draft: false
artifacts: "windows-binaries/jitsi-meet-sonn-installer.exe,linux-binaries/jitsi-meet-sonn-amd64.deb,linux-binaries/jitsi-meet-sonn-x86_64.AppImage"
token: ${{secrets.GITHUB_TOKEN}}
makeLatest: true
13 changes: 13 additions & 0 deletions patches/electron-reload+1.5.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/electron-reload/main.js b/node_modules/electron-reload/main.js
index 688934d..860e071 100644
--- a/node_modules/electron-reload/main.js
+++ b/node_modules/electron-reload/main.js
@@ -9,7 +9,7 @@ const ignoredPaths = /node_modules|[/\\]\./
// only effective when the process is restarted (hard reset)
// We assume that electron-reload is required by the main
// file of the electron application
-const mainFile = module.parent.filename
+const mainFile = 'build/main.js'

/**
* Creates a callback for hard resets.

0 comments on commit 6c06177

Please sign in to comment.