Skip to content

Commit efeca3b

Browse files
committed
Merge branch 'main' into release/0.2
2 parents e08dadc + 368b41c commit efeca3b

File tree

15 files changed

+237
-14
lines changed

15 files changed

+237
-14
lines changed

.github/workflows/ci_cd.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
146146
- uses: actions/upload-artifact@v3
147147
with:
148-
name: Python-Installer
148+
name: Python-Installer-Signed
149149
path: signtool/installer/*Setup*.exe
150150

151151
release:
@@ -154,6 +154,11 @@ jobs:
154154
needs: [sign-application]
155155
runs-on: ubuntu-latest
156156
steps:
157+
- uses: actions/download-artifact@v3
158+
with:
159+
name: Python-Installer-Signed
160+
path: installer-signed
161+
157162
- uses: actions/download-artifact@v3
158163
with:
159164
name: Python-Installer
@@ -162,10 +167,18 @@ jobs:
162167
- name: Display structure of downloaded files
163168
run: ls -R
164169

165-
- name: "Release to GitHub"
170+
- name: Rename unsigned exe
171+
run: |
172+
cd installer
173+
for filename in *.exe; do mv "$filename" "Unsigned_${filename}"; done;
174+
cd -
175+
176+
- name: Release to GitHub
166177
uses: softprops/action-gh-release@v1
167178
with:
168-
files: installer/*.exe
179+
files: |
180+
installer-signed/*.exe
181+
installer/*.exe
169182
generate_release_notes: true
170183

171184
doc-deploy-release:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- --line-length=88
1414

1515
- repo: https://github.com/psf/black
16-
rev: 23.3.0
16+
rev: 23.7.0
1717
hooks:
1818
- id: black
1919
args:
81.8 KB
Loading
92.2 KB
Loading
41.8 KB
Loading
39.5 KB
Loading
92.5 KB
Loading
31 KB
Loading
31.9 KB
Loading

doc/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212

1313
installer
1414
contributing
15+
user_guide

0 commit comments

Comments
 (0)