From e9feec37d506772d5a9e2ce8654232cf42e34013 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 3 May 2024 11:28:06 +0530 Subject: [PATCH] Run the electron builder in the correct path --- desktop/.github/workflows/desktop-release.yml | 2 ++ desktop/docs/release.md | 17 +++-------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/desktop/.github/workflows/desktop-release.yml b/desktop/.github/workflows/desktop-release.yml index ef198ca48a..7013d3e579 100644 --- a/desktop/.github/workflows/desktop-release.yml +++ b/desktop/.github/workflows/desktop-release.yml @@ -71,6 +71,8 @@ jobs: - name: Build uses: ente-io/action-electron-builder@v1.0.0 with: + package_root: desktop + # GitHub token, automatically provided to the action # (No need to define this secret in the repo settings) github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/desktop/docs/release.md b/desktop/docs/release.md index 0d1b11bc63..da807b572c 100644 --- a/desktop/docs/release.md +++ b/desktop/docs/release.md @@ -34,22 +34,11 @@ The workflow is: git push origin photosd-v1.x.x ``` -3. Head over to the releases repository, copy all relevant changes from the - source repository, commit and push the changes. +3. Head over to the releases repository and run the trigger script, passing it + the tag _without_ the `photosd-` prefix. ```sh - cp ../ente/desktop/CHANGELOG.md CHANGELOG.md - git add CHANGELOG.md - git commit -m 'Release v1.x.x' - git push origin main - ``` - -4. Tag this commit, but this time _don't_ use the `photosd-` prefix. Push the - tag to trigger the GitHub action. - - ```sh - git tag v1.x.x - git push origin v1.x.x + ./.github/trigger-release.sh v1.x.x ``` ## Post build