Skip to content

Commit

Permalink
build: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Nov 27, 2024
1 parent 7a4dca8 commit a41c340
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
files: |
./build-recipes/dist/*.dmg
./build-recipes/dist/*.pkg
./build-recipes/Output/*.exe
# ./build-recipes/Output/*.exe
10 changes: 0 additions & 10 deletions .github/workflows/deploy_github_signed_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ jobs:
shell: bash
run: |
rm ./build-recipes/dist/PyJibe/PyJibe.exe
echo ${{ toJSON('0.1.2') }}
echo "${{ env.RELEASE_VERSION }}"
echo '${{ env.RELEASE_VERSION }}'
- name: Sign Windows executable
uses: signpath/github-action-submit-signing-request@v1
with:
Expand Down Expand Up @@ -89,18 +86,11 @@ jobs:
output-artifact-directory: 'build-recipes/Output'
parameters: |
Version: "${{ env.RELEASE_VERSION }}"
- name: Rename windows installer to signed
shell: bash
run: |
pushd ./build-recipes/Output/
for file in *.exe ; do mv $file ${file//PyJibe/PyJibe_signed} ; done
- name: Release Assets
uses: softprops/action-gh-release@v1
with:
name: PyJibe ${{ env.RELEASE_VERSION }}
draft: true
prerelease: false
files: |
./build-recipes/dist/*.dmg
./build-recipes/dist/*.pkg
./build-recipes/Output/*.exe
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.15.9
- build: fix installation directory
- build: disable unsigned installer
0.15.8
- docs: fix broken link to code signing
0.15.7
Expand Down
5 changes: 3 additions & 2 deletions build-recipes/win_pyjibe.iss_dummy
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={localappdata}\{#MyAppPublisher}{#MyAppName}
DefaultDirName={autopf}\{#MyAppName}
DisableDirPage=yes
UsePreviousAppDir=false
DefaultGroupName={#MyAppName}
Expand All @@ -31,7 +31,8 @@ Compression=lzma
SolidCompression=yes
ChangesAssociations=yes
PrivilegesRequired=lowest

PrivilegesRequiredOverridesAllowed=dialog
WizardStyle=modern

[Registry]
Root: HKCU; Subkey: ".jpk-force"; ValueType: string; ValueName: ""; ValueData: "{#MyAppName}"; Flags: uninsdeletevalue
Expand Down
4 changes: 1 addition & 3 deletions docs/sec_code_signing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ Code Signing Policy

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


Project Integrity
Expand Down
6 changes: 1 addition & 5 deletions pyjibe/head/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,7 @@ def check_release(ghrepo="user/repo", version=None, timeout=20):
if hasattr(sys, "frozen"):
# determine which binary URL we need
if sys.platform == "win32":
nbit = 8 * struct.calcsize("P")
if nbit == 32:
dlid = "win_32bit_setup.exe"
else:
dlid = "win_64bit_setup.exe"
dlid = "win_64bit_setup.exe"
elif sys.platform == "darwin":
dlid = ".pkg"
else:
Expand Down

0 comments on commit a41c340

Please sign in to comment.