Skip to content

Commit e7630e9

Browse files
committed
修复工作区不干净的问题
1 parent 9779c1e commit e7630e9

4 files changed

Lines changed: 22 additions & 25 deletions

File tree

.github/actions/setup/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ runs:
1515
with:
1616
path: |
1717
${{ env.NPM_CACHE }}
18-
${{ env.ELECTRON_CACHE }}
19-
${{ env.ELECTRON_BUILDERCACHE }}
2018
key: ${{ runner.os }}-node-modules-cache-${{ hashFiles('package-lock.json') }}
2119
restore-keys: |
2220
${{ runner.os }}-node-modules-cache-

.github/workflows/beta-pack.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ jobs:
4242
runs-on: windows-latest
4343
env:
4444
NPM_CACHE: '%APPDATA%\npm-cache'
45-
ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
46-
ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
4745
# needs: CheckCode
4846
steps:
4947
- name: Check out git repository
@@ -53,7 +51,9 @@ jobs:
5351
uses: ./.github/actions/setup
5452

5553
- name: Build src code
56-
run: npm run build
54+
run: |
55+
git status --porcelain
56+
npm run build
5757
5858
- name: Build Package Setup x64
5959
run: npm run pack:win:setup:x64
@@ -129,8 +129,6 @@ jobs:
129129
# needs: CheckCode
130130
env:
131131
NPM_CACHE: $HOME/.npm
132-
ELECTRON_CACHE: $HOME/.cache/electron
133-
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
134132
steps:
135133
- name: Check out git repository
136134
uses: actions/checkout@v4
@@ -142,7 +140,9 @@ jobs:
142140
uses: ./.github/actions/setup
143141

144142
- name: Build src code
145-
run: npm run build
143+
run: |
144+
git status --porcelain
145+
npm run build
146146
147147
- name: Build Package dmg
148148
run: |
@@ -172,8 +172,6 @@ jobs:
172172
runs-on: ubuntu-latest
173173
env:
174174
NPM_CACHE: $HOME/.npm
175-
ELECTRON_CACHE: $HOME/.cache/electron
176-
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
177175
# needs: CheckCode
178176
steps:
179177
- name: Install package
@@ -186,7 +184,9 @@ jobs:
186184
uses: ./.github/actions/setup
187185

188186
- name: Build src code
189-
run: npm run build
187+
run: |
188+
git status --porcelain
189+
npm run build
190190
191191
- name: Build Package deb amd64
192192
run: npm run pack:linux:deb:amd64

.github/workflows/release.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ jobs:
4242
runs-on: windows-latest
4343
env:
4444
NPM_CACHE: '%APPDATA%\npm-cache'
45-
ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
46-
ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
4745
# needs: CheckCode
4846
steps:
4947
- name: Check out git repository
@@ -53,7 +51,9 @@ jobs:
5351
uses: ./.github/actions/setup
5452

5553
- name: Build src code
56-
run: npm run build
54+
run: |
55+
git status --porcelain
56+
npm run build
5757
5858
- name: Release package
5959
run: |
@@ -76,9 +76,6 @@ jobs:
7676
runs-on: windows-latest
7777
env:
7878
NPM_CACHE: '%APPDATA%\npm-cache'
79-
ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
80-
ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
81-
BUILD_WIN_7: 'true'
8279
# needs: CheckCode
8380
steps:
8481
- name: Check out git repository
@@ -88,7 +85,9 @@ jobs:
8885
uses: ./.github/actions/setup
8986

9087
- name: Build src code
91-
run: npm run build
88+
run: |
89+
git status --porcelain
90+
npm run build
9291
9392
- name: Prepare win7 electron env
9493
run: |
@@ -114,8 +113,6 @@ jobs:
114113
runs-on: macos-latest
115114
env:
116115
NPM_CACHE: $HOME/.npm
117-
ELECTRON_CACHE: $HOME/.cache/electron
118-
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
119116
# needs: CheckCode
120117
steps:
121118
- name: Check out git repository
@@ -128,7 +125,9 @@ jobs:
128125
uses: ./.github/actions/setup
129126

130127
- name: Build src code
131-
run: npm run build
128+
run: |
129+
git status --porcelain
130+
npm run build
132131
133132
- name: Release package
134133
run: |
@@ -148,8 +147,6 @@ jobs:
148147
runs-on: ubuntu-latest
149148
env:
150149
NPM_CACHE: $HOME/.npm
151-
ELECTRON_CACHE: $HOME/.cache/electron
152-
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
153150
# needs: CheckCode
154151
steps:
155152
- name: Install package
@@ -162,7 +159,9 @@ jobs:
162159
uses: ./.github/actions/setup
163160

164161
- name: Build src code
165-
run: npm run build
162+
run: |
163+
git status --porcelain
164+
npm run build
166165
167166
- name: Release package
168167
run: |

build-config/renderer/webpack.config.prod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const gitInfo = {
1919
}
2020

2121
try {
22-
if (!execSync('git status --porcelain').toString().trim() || process.env.BUILD_WIN_7) {
22+
if (!execSync('git status --porcelain').toString().trim()) {
2323
gitInfo.commit_id = execSync('git log -1 --pretty=format:"%H"').toString().trim()
2424
gitInfo.commit_date = execSync('git log -1 --pretty=format:"%ad" --date=iso-strict').toString().trim()
2525
}

0 commit comments

Comments
 (0)