Skip to content

Commit 20eec10

Browse files
committed
use only one certificate for now. also mark pkg as artifact
1 parent 15acfcf commit 20eec10

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ jobs:
2222

2323
- name: Build
2424
run: swift build -v -c release
25-
- name: Import Installer Siging
26-
uses: apple-actions/import-codesign-certs@v1
27-
with:
28-
p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
29-
p12-password: ${{ secrets.CERTIFICATES_INSTALLER_P12_PASSWORD }}
3025
- name: Import Application Siging
3126
uses: apple-actions/import-codesign-certs@v1
3227
with:
33-
p12-file-base64: ${{ secrets.CERTIFICATES_APPLICATION_P12 }}
28+
p12-file-base64: ${{ secrets.CERTIFICATES_APPLICATION_P12_PASSWORD }}
3429
p12-password: ${{ secrets.CERTIFICATES_APPLICATION_P12_PASSWORD }}
3530
- name: Code Sign
3631
run: |
@@ -39,10 +34,10 @@ jobs:
3934
run: zip --junk-paths ${{ runner.temp }}/archive.zip .build/release/rswift License
4035
- name: Package
4136
run: |
42-
pkgbuild --root .build/release --identifier "nl.mathijskadijk.rswift" --version $TAG_NAME --install-location "/Applications" --sign "Developer ID Installer: Mathijs Kadijk (5Z49PA849J)" $FILENAME
37+
pkgbuild --root .build/release --identifier "nl.mathijskadijk.rswift" --version $TAG_NAME --install-location "/Applications" --sign "Developer ID Application: Mathijs Kadijk (5Z49PA849J)" $FILENAME
4338
env:
4439
TAG_NAME: ${{ github.event.release.tag_name }}
45-
FILENAME: rswift-${{ github.event.release.tag_name }}.pkg
40+
FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.pkg
4641
BUNDLE_ID: nl.mathijskadijk.rswift
4742
- name: Notarize
4843
run: |
@@ -51,8 +46,8 @@ jobs:
5146
BUNDLE_ID: nl.mathijskadijk.rswift
5247
DEV_ACCOUNT: ${{ secrets.APPLE_ID_EMAIL }}
5348
PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
54-
DEV_TEAM: 5Z49PA849J
55-
FILENAME: rswift-${{ github.event.release.tag_name }}.pkg
49+
DEV_TEAM: ${{ secrets.APPLE_TEAM_ID }}
50+
FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.pkg
5651
- name: Upload
5752
uses: actions/upload-release-asset@v1
5853
env:
@@ -62,6 +57,15 @@ jobs:
6257
asset_path: ${{ runner.temp }}/archive.zip
6358
asset_name: rswift-${{ github.event.release.tag_name }}.zip
6459
asset_content_type: application/zip
60+
- name: Upload PKG
61+
uses: actions/upload-release-asset@v1
62+
env:
63+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
with:
65+
upload_url: ${{ github.event.release.upload_url }}
66+
asset_path: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.pkg
67+
asset_name: rswift-${{ github.event.release.tag_name }}.pkg
68+
asset_content_type: application/pkg
6569

6670
- name: Store artifact
6771
uses: actions/upload-artifact@v1

0 commit comments

Comments
 (0)