Skip to content

Commit

Permalink
first pass on internal input resolution part 4
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Nov 18, 2024
1 parent a9e8dd2 commit 9bfc0eb
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ runs:
fi
# notarize logix
if [ "${{ runner.os }}" = "macOS" ] \
if [ "${{ runner.os }}" == "macOS" ] \
&& [[ -n "${{ inputs.apple-notary-password }}" ]] \
&& [[ -n "${{ inputs.apple-notary-user }}" ]] \
&& [[ -n "${{ inputs.apple-product-id }}" ]]; then
Expand All @@ -132,8 +132,8 @@ runs:
- name: Set filey internal inputs
shell: powershell
if: os.runner == 'Windows'
id: code-sign-action-files-internal
if: runner.os == 'Windows'
id: code-sign-action-win-internal
run: |
# sign cert
$certpath = "$env:RUNNER_TEMP\signcert.p12"
Expand All @@ -148,8 +148,8 @@ runs:
- name: Set filey internal inputs
shell: bash
if: os.runner != 'Windows'
id: code-sign-action-files-internal
if: runner.os != 'Windows'
id: code-sign-action-posix-internal
run: |
# sign cert
certpath="$RUNNER_TEMP/signcert.p12"
Expand All @@ -166,13 +166,20 @@ runs:
shell: bash
id: code-sign-action-internal
run: |
# sign cert
echo "file=${{ steps.code-sign-action-files-internal.file }}" >> $GITHUB_OUTPUT
# generics
echo "notarize=${{ steps.code-sign-action-generic-internal.notarize }}" >> $GITHUB_OUTPUT
echo "os=${{ steps.code-sign-action-generic-internal.os }}" >> $GITHUB_OUTPUT
echo "signcert=${{ steps.code-sign-action-files-internal.signcert }}" >> $GITHUB_OUTPUT
echo "signtool=${{ steps.code-sign-action-generic-internal.signtool }}" >> $GITHUB_OUTPUT
# osy
if [ "${{ runner.os }}" == "Windows" ]; then
echo "file=${{ steps.code-sign-action-win-internal.file }}" >> $GITHUB_OUTPUT
echo "signcert=${{ steps.code-sign-action-win-internal.signcert }}" >> $GITHUB_OUTPUT
else
echo "file=${{ steps.code-sign-action-posix-internal.file }}" >> $GITHUB_OUTPUT
echo "signcert=${{ steps.code-sign-action-posix-internal.signcert }}" >> $GITHUB_OUTPUT
fi
- name: Verify Outputs
shell: bash
run: |
Expand All @@ -184,7 +191,6 @@ runs:
echo "signtool=${{ steps.code-sign-action-internal.outputs.signtool }}"
echo "::endgroup::"
- name: Validate macos specific inputs
shell: bash
if: steps.code-sign-action-internal.outputs.os == 'macos'
Expand Down

0 comments on commit 9bfc0eb

Please sign in to comment.