Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sign package files #139

Merged
merged 25 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
59bad38
added some tests for codesigning
Jul 24, 2024
41d1196
implemented FileSigner and KeyProvider classes for signing files.
Jul 24, 2024
59292ce
added more config options for setting up package signing
Jul 25, 2024
4f4ece3
fixed build errors. Now run integration tests on jdk 8, 11, and 17
Jul 25, 2024
1d57460
partial check-in with package sign
Aug 5, 2024
bf565bd
fixed file signer unit test
shannah Aug 5, 2024
d2ede9a
added support for providing trusted certificates in app bundle separa…
shannah Aug 5, 2024
e9fd8ab
updated keystore providers to handle root certs
shannah Aug 6, 2024
e6123e8
added support for environment variable JDEPLOY_DEVELOPER_CA_ID which …
shannah Aug 6, 2024
165a7b7
added certificate fingerprints to package.json and app.xml for mac bu…
shannah Aug 10, 2024
ee8d2f6
added certificate pinning support
shannah Aug 10, 2024
935b28d
added verify-package cli command. untested yet
shannah Aug 18, 2024
638c327
added unit test for VerifyPackageService
shannah Aug 18, 2024
48f4c5f
added ability to pass app.xml as --keystore parameter to the verify-p…
shannah Aug 25, 2024
a46e8d1
added integration test or verify-package cli command
shannah Aug 25, 2024
73f9370
added dmg command
shannah Sep 2, 2024
6d87461
added support for JDEPLOY_SOURCE environemnt variable in dmg command …
shannah Oct 5, 2024
f3de15d
fix compile error
shannah Oct 5, 2024
fcdd139
fixed another compile error
shannah Oct 5, 2024
bb3f298
removed noise in maven logs
shannah Oct 5, 2024
535c88b
fixed issue with version in dmg command
shannah Oct 5, 2024
4e4b9e9
fix compile error
shannah Oct 5, 2024
630ef1a
fixed versioning for dmg
shannah Oct 5, 2024
87d8835
fixed compile error
shannah Oct 5, 2024
be1e686
updated launchers
shannah Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 49 additions & 44 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,54 +10,59 @@ jobs:

test-linux-amd64:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ '8', '11', '17' ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: maven
- name: Test Linux
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java-version }}
distribution: 'adopt'
cache: maven
- name: Test Linux
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh


build-mac-x64:
runs-on: macos-latest
strategy:
matrix:
java-version: [ '8', '11', '17' ]
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: maven

- name: Test Mac
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh


- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java-version }}
distribution: 'adopt'
cache: maven

- name: Test Mac
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh


build-win-x64:
runs-on: windows-latest
strategy:
matrix:
java-version: [ '8', '11', '17' ]
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: maven

- name: Build Windows
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh
shell: bash


- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java-version }}
distribution: 'adopt'
cache: maven

- name: Build Windows
env:
JDEPLOY_TEST_JVM_DOWNLOADS: true
run: bash build_and_test.sh
shell: bash
1 change: 1 addition & 0 deletions .github/workflows/mac_codesign_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ jobs:
JDEPLOY_MAC_DEVELOPER_ID: ${{ secrets.APPLE_ID }}
JDEPLOY_MAC_DEVELOPER_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
JDEPLOY_MAC_DEVELOPER_CERTIFICATE_NAME: ${{ secrets.DEVELOPER_ID_CERTIFICATE_NAME }}
JDEPLOY_TEST_CERTIFICATE_NAME: ${{ secrets.DEVELOPER_ID_CERTIFICATE_NAME }}
run: bash build_and_test.sh
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ installer/jdeploy-bundle
cli/bin
tests/projects/*/jdeploy
./jdeploy
./.idea
./.idea/jarRepositories.xml
./.idea/vcs.xml
#./installer/tests/*/mock_launcher*
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ runs:
export PATH="$JAVA_HOME/bin:$PATH"
echo "Building jDeploy from source..."
cd jdeploy-source/shared
mvn clean install -DskipTests
mvn clean install -DskipTests --batch-mode --no-transfer-progress
cd ../cli
mvn clean package -DskipTests
mvn clean package -DskipTests --batch-mode --no-transfer-progress
npm install
npm link
echo "jdeploy_exec=$(which jdeploy)" >> $GITHUB_ENV
Expand Down
8 changes: 1 addition & 7 deletions cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,7 @@

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<artifactId>mockito-inline</artifactId>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
Expand Down
Loading
Loading