Skip to content

Commit 98c8a39

Browse files
committed
Update repo dependencies and github action
1 parent 1e44b25 commit 98c8a39

File tree

3 files changed

+40
-20
lines changed

3 files changed

+40
-20
lines changed

.github/workflows/mvn.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@ jobs:
2121
- name: Set up JDK 16
2222
uses: actions/setup-java@v2
2323
with:
24-
java-version: '16'
25-
distribution: 'zulu'
24+
java-version: "16"
25+
distribution: "zulu"
2626
architecture: x64
2727
cache: maven
2828
- name: Build with Maven
2929
# still needs work to get tests running on java 16
30-
run: ./mvnw --batch-mode clean verify -DskipTests=true
30+
run: ./mvnw -e -X --batch-mode clean verify -DskipTests=true
3131
- name: Set up JDK 8
3232
uses: actions/setup-java@v2
3333
with:
34-
java-version: '8'
35-
distribution: 'zulu'
34+
java-version: "8"
35+
distribution: "zulu"
3636
architecture: x64
3737
cache: maven
3838
- name: Build with Maven
39-
run: ./mvnw --batch-mode clean verify
40-
39+
run: ./mvnw -e -X --batch-mode clean verify

README.md

+19-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This repository contains a Java Client and a [JCA provider](https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html) for Parsec. The client exposes the [PSA Crypto API](https://github.com/ARMmbed/mbed-crypto/blob/psa-crypto-api/docs/PSA_Cryptography_API_Specification.pdf) to Java Applications and the JCA Provider allows existing applications that employ JCA to switch to Parsec.
44

5-
*Note*: this client is at an early stage of development and not yet ready for production use. We welcome contributions!
5+
_Note_: this client is at an early stage of development and not yet ready for production use. We welcome contributions!
66

77
## In this repository
88

@@ -12,16 +12,29 @@ The repository contains the following packages:
1212
- parsec-jca-java: JCA Provider
1313
- parsec-interface-java: Private wrapper for protobuf classes and socket communication
1414
- parsec-protobuf-java: Java Protobuf classes (generated)
15-
- parsec-testcontainers: Collection of Docker test containers for development & testing
15+
- parsec-testcontainers: Collection of Docker test containers for development & testing
1616

1717
# How to use this library
18+
1819
TODO
1920

2021
# How to develop the Parsec Java Client
21-
TODO
22+
23+
Check out all submodules
24+
25+
```
26+
git submodule update --init --recursive
27+
```
28+
29+
Use act to run the github action locally. On OSX, run in this way:
30+
31+
```sh
32+
act --container-architecture linux/amd64
33+
```
2234

2335
# Example Implementations
24-
There are a number of example implementations of both the basic java client and JCA provider along with a demo (separate repository)
36+
37+
There are a number of example implementations of both the basic java client and JCA provider along with a demo (separate repository)
2538
Both the tests and workshop demo cover the basic functionality of the current implementation:
2639

2740
- Parsec JCA Tests [**Link**](/parsec-jca-test)
@@ -34,10 +47,8 @@ The software is provided under Apache-2.0. Contributions to this project are acc
3447

3548
## Contributing
3649

37-
We welcome contributing, both in the use of this client library and programming,extending of this library code base.
50+
We welcome contributing, both in the use of this client library and programming,extending of this library code base.
3851
Please check the [**Contribution Guidelines**](https://parallaxsecond.github.io/parsec-book/contributing/index.html)
3952
to know more about the contribution process.
4053

41-
*Copyright 2021 Contributors to the Parsec project.*
42-
43-
54+
_Copyright 2021 Contributors to the Parsec project._

parsec-testcontainers/docker-bake.hcl

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
group "default" {
2-
#targets = ["parsec", "parsec_0.7.0", "parsec_0.8.1"]
3-
targets = ["parsec_0.8.1", "nginx-test"]
2+
#targets = ["parsec", "parsec_0-7-0", "parsec_0-8-1", "parsec_1-4-1"]
3+
targets = ["parsec_1-4-1", "nginx-test"]
44
}
55
target "generic" {
66
context = "."
@@ -25,16 +25,26 @@ target "parsec" {
2525
"parallaxsecond/parsec:latest"
2626
]
2727
}
28-
target "parsec_0.8.1" {
28+
target "parsec_1-4-1" {
2929
inherits = ["parsec"]
3030
args = {
31-
PARSEC_BRANCH = "0.8.1"
31+
PARSEC_BRANCH = "main"
32+
}
33+
tags = [
34+
"parallaxsecond/parsec:1.4.1"
35+
]
36+
}
37+
38+
target "parsec_0-8-1" {
39+
inherits = ["parsec"]
40+
args = {
41+
PARSEC_BRANCH = "main"
3242
}
3343
tags = [
3444
"parallaxsecond/parsec:0.8.1"
3545
]
3646
}
37-
target "parsec_0.7.0" {
47+
target "parsec_0-7-0" {
3848
inherits = ["parsec"]
3949
args = {
4050
PARSEC_BRANCH = "0.7.0"

0 commit comments

Comments
 (0)