Skip to content

Commit

Permalink
Remove Jsign from Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
bisera-cognite committed Sep 5, 2023
1 parent e327b3a commit 06cdbb9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/run-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
uses: cognitedata/code-sign-action/@v2.12
uses: cognitedata/code-sign-action/@v2.13
with:
path-to-binary: 'test\test.dll'

Expand All @@ -32,7 +32,7 @@ jobs:
CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
uses: cognitedata/code-sign-action/@v2.12
uses: cognitedata/code-sign-action/@v2.13
with:
path-to-binary: 'test\test.dll'

Expand All @@ -49,7 +49,7 @@ jobs:
CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
uses: cognitedata/code-sign-action/@v2.12
uses: cognitedata/code-sign-action/@v2.13
with:
path-to-binary: "test/test.dll"

Expand All @@ -60,6 +60,6 @@ jobs:
CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
uses: cognitedata/code-sign-action/@v2.12
uses: cognitedata/code-sign-action/@v2.13
with:
path-to-binary: "test/test.dll"
26 changes: 12 additions & 14 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@ runs:
echo "/tmp/DigiCert One Signing Manager Tools/smtools-linux-x64" >> $GITHUB_PATH
fi
shell: bash
# if: ${{ env.DEPS_INSTALLED }} != "TRUE"

- name: Code signing with Secure Software Manager
uses: digicert/[email protected]
env:
SM_API_KEY: ${{ env.SM_API_KEY }}
SM_CLIENT_CERT_PASSWORD: ${{ env.SM_CLIENT_CERT_PASSWORD }}
SM_CLIENT_CERT_FILE: ${{ env.SM_CLIENT_CERT_FILE }}
if: ${{ env.DEPS_INSTALLED }} != "TRUE"

- name: Sign with smctl Windows
env:
Expand All @@ -70,11 +68,11 @@ runs:

- name: Sign with smctl Linux
run: |
if [ ${{ env.DEPS_INSTALLED }} != "TRUE" ]
then
curl -fSslL https://github.com/ebourg/jsign/releases/download/3.1/jsign_3.1_all.deb -o jsign_3.1_all.deb
sudo dpkg --install jsign_3.1_all.deb
fi
# if [ "${{ env.DEPS_INSTALLED }}" != "TRUE" ]
# then
# curl -fSslL https://github.com/ebourg/jsign/releases/download/3.1/jsign_3.1_all.deb -o jsign_3.1_all.deb
# sudo dpkg --install jsign_3.1_all.deb
# fi
file_path="${{ inputs.path-to-binary }}"
for f in $(find $file_path -type f); do
echo $f
Expand All @@ -83,10 +81,10 @@ runs:
if: runner.os == 'Linux'
shell: bash

- name: Set dependency envar
id: dep-var
run: |
echo "${{ env.DEPS_INSTALLED }}"
echo "DEPS_INSTALLED=TRUE" >> "$GITHUB_ENV"
echo "${{ env.DEPS_INSTALLED }}"
shell: bash
# - name: Set dependency envar
# id: dep-var
# run: |
# echo "$DEPS_INSTALLED"
# echo "DEPS_INSTALLED=TRUE" >> "$GITHUB_ENV"
# echo "$DEPS_INSTALLED"
# shell: bash

0 comments on commit 06cdbb9

Please sign in to comment.