Skip to content

Commit 03dbd96

Browse files
committed
Revert "ci: integrate signpath"
This reverts commit c033718. Revert until the SignPath GitHub app does not require admin permissions.
1 parent 5a5602e commit 03dbd96

File tree

3 files changed

+22
-57
lines changed

3 files changed

+22
-57
lines changed

.github/workflows/guix.yml

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ jobs:
3636
- target: "x86_64-w64-mingw32.installer"
3737
- target: "x86_64-apple-darwin"
3838
- target: "arm64-apple-darwin"
39-
outputs:
40-
WIN_INSTALLER_ARTIFACT_ID: ${{ steps.win-installer.outputs.WIN_INSTALLER_ARTIFACT_ID }}
41-
WIN_EXECUTABLE_ARTIFACT_ID: ${{ steps.win-executable.outputs.WIN_EXECUTABLE_ARTIFACT_ID }}
39+
4240
name: ${{ matrix.toolchain.target }}
4341
steps:
4442
- uses: actions/checkout@v4
@@ -57,7 +55,7 @@ jobs:
5755
path: contrib/depends/sources
5856
key: sources-${{ hashFiles('contrib/depends/packages/*') }}
5957
- name: install dependencies
60-
run: sudo apt update; sudo apt -y install guix git ca-certificates apparmor-utils osslsigncode
58+
run: sudo apt update; sudo apt -y install guix git ca-certificates apparmor-utils
6159
- name: fix apparmor
6260
run: sudo cp .github/workflows/guix /etc/apparmor.d/guix; sudo /etc/init.d/apparmor reload; sudo aa-enforce guix || echo "failed"
6361
- name: purge apparmor
@@ -74,18 +72,11 @@ jobs:
7472
files: |
7573
guix/guix-build-*/build/distsrc-*/build/bin/feather.exe
7674
- uses: actions/upload-artifact@v4
77-
id: upload-artifact
7875
with:
7976
name: ${{ matrix.toolchain.target }}
8077
path: |
8178
guix/guix-build-*/output/${{ matrix.toolchain.target }}/*
8279
guix/guix-build-*/logs/${{ matrix.toolchain.target }}/*
83-
- if: ${{ matrix.toolchain.target == 'x86_64-w64-mingw32.installer' }}
84-
id: win-installer
85-
run: echo "WIN_INSTALLER_ARTIFACT_ID=${{ steps.upload-artifact.outputs.artifact-id }}" >> "$GITHUB_OUTPUT"
86-
- if: ${{ matrix.toolchain.target == 'x86_64-w64-mingw32' }}
87-
id: win-executable
88-
run: echo "WIN_EXECUTABLE_ARTIFACT_ID=${{ steps.upload-artifact.outputs.artifact-id }}" >> "$GITHUB_OUTPUT"
8980
9081
bundle-logs:
9182
runs-on: ubuntu-24.04
@@ -109,45 +100,3 @@ jobs:
109100
artifacts: "**/*.AppImage,**/*-linux-arm.zip,**/*-linux-arm64.zip,**/*-linux-riscv64.zip,**/*-linux.zip,**/*-mac-arm64.zip,**/*-mac.zip,**/*-win.zip,**/FeatherWalletSetup-*.exe,**/feather-${{github.ref_name}}.tar.gz"
110101
draft: true
111102
name: v${{github.ref_name}}
112-
113-
codesigning:
114-
runs-on: ubuntu-24.04
115-
needs: [build-guix, bundle-logs]
116-
if: startsWith(github.ref, 'refs/tags/')
117-
strategy:
118-
fail-fast: false
119-
matrix:
120-
toolchain:
121-
- target: "x86_64-w64-mingw32"
122-
- target: "x86_64-w64-mingw32.installer"
123-
steps:
124-
- name: install dependencies
125-
run: sudo apt update; sudo apt -y install osslsigncode
126-
- name: "set artifact id"
127-
run: |
128-
if [ "${{ matrix.toolchain.target }}" == "x86_64-w64-mingw32" ]; then
129-
echo "ARTIFACT_ID=${{ needs.build-guix.outputs.WIN_EXECUTABLE_ARTIFACT_ID }}" >> $GITHUB_ENV
130-
echo "ARTIFACT_SLUG=executable" >> $GITHUB_ENV
131-
elif [ "${{ matrix.toolchain.target }}" == "x86_64-w64-mingw32.installer" ]; then
132-
echo "ARTIFACT_ID=${{ needs.build-guix.outputs.WIN_INSTALLER_ARTIFACT_ID }}" >> $GITHUB_ENV
133-
echo "ARTIFACT_SLUG=installer" >> $GITHUB_ENV
134-
fi
135-
- uses: signpath/github-action-submit-signing-request@v1
136-
name: "request signature"
137-
with:
138-
api-token: '${{ secrets.SIGNPATH_API_KEY }}'
139-
organization-id: 'd3e94749-9c69-44e9-82de-c65cb3832869'
140-
project-slug: 'feather'
141-
signing-policy-slug: 'release-signing'
142-
artifact-configuration-slug: ${{ env.ARTIFACT_SLUG }}
143-
github-artifact-id: ${{ env.ARTIFACT_ID }}
144-
wait-for-completion: true
145-
output-artifact-directory: codesigning/
146-
- name: "extract signature"
147-
run: osslsigncode extract-signature -in codesigning/guix-build-*/output/${{ matrix.toolchain.target }}/*-unsigned.exe -out codesigning/${{ matrix.toolchain.target }}-${{github.ref_name}}.pem
148-
- uses: actions/upload-artifact@v4
149-
name: "upload signature"
150-
with:
151-
name: ${{ matrix.toolchain.target }}.pem
152-
path: |
153-
codesigning/${{ matrix.toolchain.target }}-${{github.ref_name}}.pem

contrib/guix/libexec/build.sh

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,25 @@ mkdir -p "$DISTSRC"
415415
# for release
416416
case "$HOST" in
417417
*mingw*)
418-
if [ -z "$OPTIONS" ]; then
419-
mv feather.exe "${OUTDIR}/${DISTNAME}-unsigned.exe"
420-
fi
418+
case "$OPTIONS" in
419+
installer)
420+
find . -print0 \
421+
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
422+
find . \
423+
| sort \
424+
| zip -X@ "${OUTDIR}/${DISTNAME}-win-installer.zip" \
425+
|| ( rm -f "${OUTDIR}/${DISTNAME}-win-installer.zip" && exit 1 )
426+
;;
427+
"")
428+
mv feather.exe ${DISTNAME}.exe && \
429+
find . -print0 \
430+
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
431+
find . \
432+
| sort \
433+
| zip -X@ "${OUTDIR}/${DISTNAME}-win.zip" \
434+
|| ( rm -f "${OUTDIR}/${DISTNAME}-win.zip" && exit 1 )
435+
;;
436+
esac
421437
;;
422438
*linux*)
423439
if [ "$OPTIONS" != "pack" ]; then

contrib/installers/windows/setup.nsi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name "Feather Wallet"
22

3-
OutFile "${CUR_PATH}\contrib\installers\windows\FeatherWalletSetup-@PROJECT_VERSION@-unsigned.exe"
3+
OutFile "${CUR_PATH}\contrib\installers\windows\FeatherWalletSetup-@PROJECT_VERSION@.exe"
44
RequestExecutionLevel highest
55
SetCompressor /SOLID lzma
66
SetDateSave off

0 commit comments

Comments
 (0)