diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index e521dde8..00000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,34 +0,0 @@
-workflow "Default workflow for pushes" {
- on = "push"
- resolves = "release"
-}
-
-action "mvn-11" {
- uses = "docker://maven:3.6.1-jdk-11"
- runs = "mvn"
- args = "-U -B verify"
-}
-
-action "mvn" {
- needs = "mvn-11"
- uses = "docker://maven:3.6.1-jdk-8"
- # uses = "docker://martinpaljak/gppro-build"
- runs = "mvn"
- args = "-U -B clean verify"
-}
-
-
-action "on-tag" {
- # Filter for tag
- needs = "mvn"
- uses = "actions/bin/filter@master"
- args = "tag"
-}
-
-
-action "release" {
- needs = "on-tag"
- uses = "martinpaljak/actions/deploy-release@master"
- args = "tool/target/gp.jar tool/target/gp.exe"
- secrets = ["GITHUB_TOKEN"]
-}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 00000000..478ec62d
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,21 @@
+on: pull_request
+name: PR check
+jobs:
+ mvn-java-11:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: mvn-java-11
+ uses: docker://maven:3.6.3-jdk-11
+ with:
+ entrypoint: mvn
+ args: -U -B verify
+ mvn-java-8:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: mvn-java-8
+ uses: docker://maven:3.6.3-jdk-8
+ with:
+ entrypoint: mvn
+ args: -U -B verify
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..d6e8a98a
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,49 @@
+on:
+ push:
+ tags:
+ - 'v*'
+
+name: Release CI
+
+jobs:
+ build:
+ name: Upload release
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@master
+ - name: Build
+ uses: docker://maven:3.6.3-jdk-8
+ with:
+ entrypoint: mvn
+ args: -U -B verify
+ - name: Release
+ id: create_release
+ uses: actions/create-release@v1.0.0
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ github.ref }}
+ release_name: Release ${{ github.ref }}
+ draft: false
+ prerelease: true # Manually promoted to latest release
+ - name: Upload JAR
+ id: jar
+ uses: actions/upload-release-asset@v1.0.1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: ./tool/target/gp.jar
+ asset_name: gp.jar
+ asset_content_type: application/zip
+ - name: Upload EXE
+ id: exe
+ uses: actions/upload-release-asset@v1.0.1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: ./tool/target/gp.exe
+ asset_name: gp.exe
+ asset_content_type: application/x-msdownload
diff --git a/README.md b/README.md
index 203f264e..26c418a8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Actions Status](https://wdp9fww0r9.execute-api.us-west-2.amazonaws.com/production/badge/martinpaljak/GlobalPlatformPro)](https://wdp9fww0r9.execute-api.us-west-2.amazonaws.com/production/results/martinpaljak/GlobalPlatformPro) [![Coverity status](https://scan.coverity.com/projects/4020/badge.svg?flat=1)](https://scan.coverity.com/projects/4020/) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.martinpaljak/globalplatformpro/badge.svg)](https://mvnrepository.com/artifact/com.github.martinpaljak/globalplatformpro) [![Latest release](https://img.shields.io/github/release/martinpaljak/GlobalPlatformPro.svg)](https://github.com/martinpaljak/GlobalPlatformPro/releases/latest) [![LGPL-3.0 licensed](https://img.shields.io/badge/license-LGPL-blue.svg)](https://github.com/martinpaljak/GlobalPlatformPro/blob/master/LICENSE)
+[![Build Status](https://github.com/martinpaljak/globalplatformpro/workflows/Release%20CI/badge.svg)](https://github.com/martinpaljak/globalplatformpro/workflows) [![Coverity status](https://scan.coverity.com/projects/4020/badge.svg?flat=1)](https://scan.coverity.com/projects/4020/) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.martinpaljak/globalplatformpro/badge.svg)](https://mvnrepository.com/artifact/com.github.martinpaljak/globalplatformpro) [![Latest release](https://img.shields.io/github/release/martinpaljak/GlobalPlatformPro.svg)](https://github.com/martinpaljak/GlobalPlatformPro/releases/latest) [![LGPL-3.0 licensed](https://img.shields.io/badge/license-LGPL-blue.svg)](https://github.com/martinpaljak/GlobalPlatformPro/blob/master/LICENSE)
# GlobalPlatformPro
_ from [JavaCard.pro](https://javacard.pro)_
@@ -23,7 +23,7 @@ Building JavaCard applets is equally pleasing with [ant-javacard](https://github
```shell
git clone https://github.com/martinpaljak/GlobalPlatformPro
cd GlobalPlatformPro
-mvn package && ant
+mvn package
```
## NEWS
@@ -32,7 +32,7 @@ mvn package && ant
### Usage
-*Beware: [until v0.5 is released](https://github.com/martinpaljak/GlobalPlatformPro/milestones), both command line and Java API are subject to change without notice. Check back often.*
+*Beware: both command line and Java API are subject to change without notice. Check back often.*
#### Warning about correct keying
diff --git a/pom.xml b/pom.xml
index cc207b1d..41ac69c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
4.0.0
com.github.martinpaljak
- javacard
- 19.06.19
+ metacard
+ 20.01.14
19.06.16
gppro