From ebe938e6c87715614d4d06d18e0ea849f2eb8e58 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 07:45:11 -0400 Subject: [PATCH 1/7] build: fix linux build --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2fe44f3..659278a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos, windows] + os: [macos, ubuntu, windows] runs-on: ${{ matrix.os }}-latest permissions: contents: write From b093074233d24c2a2add0b40345e5de1b4c267bd Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 08:44:15 -0400 Subject: [PATCH 2/7] fix: add missing linux dep for build --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 659278a..a8e1c3f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -37,6 +37,9 @@ jobs: ${{ runner.os }}-electron-build- - name: Install dependencies run: npm ci + - name: Install linux dependencies + if: runner.os == 'Linux' + run: sudo apt-get update && sudo apt-get install -y libx11-dev - name: Build run: npm run build env: From 88402c3f7b0ee666592751dc57b5a2854ccf0205 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 09:31:24 -0400 Subject: [PATCH 3/7] fix: dep install order --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a8e1c3f..3dd4a3a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos, ubuntu, windows] + os: [ubuntu] runs-on: ${{ matrix.os }}-latest permissions: contents: write @@ -35,11 +35,11 @@ jobs: key: ${{ runner.os }}-electron-build-${{ hashFiles('dist') }} restore-keys: | ${{ runner.os }}-electron-build- - - name: Install dependencies - run: npm ci - name: Install linux dependencies if: runner.os == 'Linux' run: sudo apt-get update && sudo apt-get install -y libx11-dev + - name: Install dependencies + run: npm ci - name: Build run: npm run build env: From 589072e3bced92eb299dae80d392db651b408a70 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 09:38:01 -0400 Subject: [PATCH 4/7] chore: correct linux deps --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3dd4a3a..20424e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -37,7 +37,7 @@ jobs: ${{ runner.os }}-electron-build- - name: Install linux dependencies if: runner.os == 'Linux' - run: sudo apt-get update && sudo apt-get install -y libx11-dev + run: sudo apt-get update && sudo apt-get install -y libxtst-dev libpng++-dev - name: Install dependencies run: npm ci - name: Build From afb34b4a21729d8dd0ac1dd4a6294eb826f321e1 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 09:38:38 -0400 Subject: [PATCH 5/7] chore: add pull_request to release triggers --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 20424e5..6b456d0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + pull_request: workflow_dispatch: concurrency: From 59db55185355aa2ad0af4120ca93a152cf5500c1 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 10:01:56 -0400 Subject: [PATCH 6/7] chore: upload build artifacts --- .github/workflows/release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6b456d0..73aad3e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,3 +51,8 @@ jobs: CSC_LINK: ${{ secrets.CSC_LINK }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} WORDS_API_KEY: ${{ secrets.WORDS_API_KEY }} + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: ${{ runner.os }}-dist + path: dist From 20fe292fec63c42d410e41766cd4b86b43379f30 Mon Sep 17 00:00:00 2001 From: Justin Paul Silva Date: Tue, 20 May 2025 10:15:45 -0400 Subject: [PATCH 7/7] chore: add macos and windows back into deploy --- .github/workflows/release.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 73aad3e..697e879 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu] + os: [macos, ubuntu, windows] runs-on: ${{ matrix.os }}-latest permissions: contents: write @@ -51,8 +51,3 @@ jobs: CSC_LINK: ${{ secrets.CSC_LINK }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} WORDS_API_KEY: ${{ secrets.WORDS_API_KEY }} - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: ${{ runner.os }}-dist - path: dist