Skip to content

Commit a41c340

Browse files
committed
build: cleanup
1 parent 7a4dca8 commit a41c340

File tree

6 files changed

+9
-21
lines changed

6 files changed

+9
-21
lines changed

.github/workflows/deploy_github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ jobs:
5858
files: |
5959
./build-recipes/dist/*.dmg
6060
./build-recipes/dist/*.pkg
61-
./build-recipes/Output/*.exe
61+
# ./build-recipes/Output/*.exe

.github/workflows/deploy_github_signed_windows.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ jobs:
4747
shell: bash
4848
run: |
4949
rm ./build-recipes/dist/PyJibe/PyJibe.exe
50-
echo ${{ toJSON('0.1.2') }}
51-
echo "${{ env.RELEASE_VERSION }}"
52-
echo '${{ env.RELEASE_VERSION }}'
5350
- name: Sign Windows executable
5451
uses: signpath/github-action-submit-signing-request@v1
5552
with:
@@ -89,18 +86,11 @@ jobs:
8986
output-artifact-directory: 'build-recipes/Output'
9087
parameters: |
9188
Version: "${{ env.RELEASE_VERSION }}"
92-
- name: Rename windows installer to signed
93-
shell: bash
94-
run: |
95-
pushd ./build-recipes/Output/
96-
for file in *.exe ; do mv $file ${file//PyJibe/PyJibe_signed} ; done
9789
- name: Release Assets
9890
uses: softprops/action-gh-release@v1
9991
with:
10092
name: PyJibe ${{ env.RELEASE_VERSION }}
10193
draft: true
10294
prerelease: false
10395
files: |
104-
./build-recipes/dist/*.dmg
105-
./build-recipes/dist/*.pkg
10696
./build-recipes/Output/*.exe

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
0.15.9
2+
- build: fix installation directory
3+
- build: disable unsigned installer
14
0.15.8
25
- docs: fix broken link to code signing
36
0.15.7

build-recipes/win_pyjibe.iss_dummy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ AppPublisher={#MyAppPublisher}
2121
AppPublisherURL={#MyAppURL}
2222
AppSupportURL={#MyAppURL}
2323
AppUpdatesURL={#MyAppURL}
24-
DefaultDirName={localappdata}\{#MyAppPublisher}{#MyAppName}
24+
DefaultDirName={autopf}\{#MyAppName}
2525
DisableDirPage=yes
2626
UsePreviousAppDir=false
2727
DefaultGroupName={#MyAppName}
@@ -31,7 +31,8 @@ Compression=lzma
3131
SolidCompression=yes
3232
ChangesAssociations=yes
3333
PrivilegesRequired=lowest
34-
34+
PrivilegesRequiredOverridesAllowed=dialog
35+
WizardStyle=modern
3536

3637
[Registry]
3738
Root: HKCU; Subkey: ".jpk-force"; ValueType: string; ValueName: ""; ValueData: "{#MyAppName}"; Flags: uninsdeletevalue

docs/sec_code_signing.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ Code Signing Policy
33

44
PyJibe uses free code signing provided by `SignPath.io <https://about.signpath.io/>`_,
55
certificate by `SignPath Foundation <https://signpath.org/>`_. These binaries
6-
are named `PyJibe_signed` on the `release page <https://github.com/AFM-analysis/PyJibe/releases>`_.
7-
You should prefer downloading these signed binaries for a smooth installation
8-
process and an uninterrupted user experience.
6+
can be downloaded from the `release page <https://github.com/AFM-analysis/PyJibe/releases>`_.
97

108

119
Project Integrity

pyjibe/head/update.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ def check_release(ghrepo="user/repo", version=None, timeout=20):
6666
if hasattr(sys, "frozen"):
6767
# determine which binary URL we need
6868
if sys.platform == "win32":
69-
nbit = 8 * struct.calcsize("P")
70-
if nbit == 32:
71-
dlid = "win_32bit_setup.exe"
72-
else:
73-
dlid = "win_64bit_setup.exe"
69+
dlid = "win_64bit_setup.exe"
7470
elif sys.platform == "darwin":
7571
dlid = ".pkg"
7672
else:

0 commit comments

Comments
 (0)