Skip to content

Commit c3efd23

Browse files
committed
Merge branch 'master' into feat/electron-get
# Conflicts: # test/src/mac/macPackagerTest.ts # test/vitest-setup.ts
2 parents 11310f4 + 04beb67 commit c3efd23

File tree

208 files changed

+5793
-2895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+5793
-2895
lines changed

.changeset/few-zebras-swim.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/lemon-moles-rhyme.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/three-doors-dream.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/wise-seas-bathe.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/actions/pnpm/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Setup pnpm
13-
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
13+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
1414
with:
1515
version: ${{ inputs.version }}
1616

.github/actions/pretest/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
using: 'composite'
1717
steps:
1818
- name: Setup pnpm
19-
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
19+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
2020
with:
2121
version: ${{ inputs.version }}
2222

@@ -40,7 +40,7 @@ runs:
4040
shell: bash
4141

4242
- name: Cache Electron
43-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
43+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
4444
with:
4545
path: ${{ inputs.cache-path }}
4646
key: ${{ inputs.cache-key }}

.github/workflows/deploy-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
]
3333
steps:
3434
- name: Download images artifact - node${{ matrix.nodeMajorVersion }}
35-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
35+
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
3636
with:
3737
name: electron-builder-all-${{ matrix.nodeMajorVersion }}
3838
path: ${{ runner.temp }}

.github/workflows/docker-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
nodeVersion: [
16-
22.13.0,
17-
20.18.1,
18-
18.20.5,
16+
22.14.0,
17+
20.18.3,
18+
18.20.7,
1919
16.20.2,
2020
14.21.3
2121
]

.github/workflows/pr-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Create versions PR & prepare publish
3636
id: changesets
37-
uses: changesets/action@v1
37+
uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc # v1.4.1
3838
with:
3939
version: pnpm ci:version
4040
commit: 'chore(deploy): Release'

.github/workflows/test.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,25 @@ env:
2626

2727
jobs:
2828
check-if-docker-build:
29-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-latest
3030
timeout-minutes: 5
3131
outputs:
32-
force-docker-build: ${{ steps.changed-files-specific.outputs.any_changed }}
32+
force-docker-build: ${{ steps.changes.outputs.docker == 'true' || steps.changes.outputs.workflow == 'true' }}
3333
steps:
3434
- name: Checkout code repository
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3636
with:
3737
fetch-depth: 0
3838

3939
- name: Determine if Dockerfiles changed
40-
id: changed-files-specific
41-
uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c # v44
40+
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
41+
id: changes
4242
with:
43-
files: docker/**/*
44-
45-
- name: Output all changed files
46-
env:
47-
ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }}
48-
run: |
49-
echo "One or more test file(s) has changed."
50-
echo "List all the files that have changed: $ALL_CHANGED_FILES"
43+
filters: |
44+
docker:
45+
- 'docker/**'
46+
workflow:
47+
- '.github/workflows/docker*'
5148
5249
run-docker-build:
5350
needs: check-if-docker-build
@@ -90,7 +87,7 @@ jobs:
9087
- name: Download test-runner if exists
9188
if: needs.run-docker-build.result == 'success'
9289
id: download-test-runner-image
93-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
90+
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
9491
with:
9592
name: electron-builder-all-${{ env.TEST_IMAGE_NODE_MAJOR_VERSION }}
9693
path: ${{ runner.temp }}
@@ -136,7 +133,7 @@ jobs:
136133

137134
- name: Download test-runner if exists
138135
if: needs.run-docker-build.result == 'success'
139-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
136+
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
140137
with:
141138
name: electron-builder-all-${{ env.TEST_IMAGE_NODE_MAJOR_VERSION }}
142139
path: ${{ runner.temp }}

0 commit comments

Comments
 (0)