diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml index 3efbf979b..0d443fc0a 100644 --- a/.github/workflows/linux-aarch64.yml +++ b/.github/workflows/linux-aarch64.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/linux-armv7.yml b/.github/workflows/linux-armv7.yml index 73106a7e2..bfb9553ab 100644 --- a/.github/workflows/linux-armv7.yml +++ b/.github/workflows/linux-armv7.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml index 0d142f3e4..f23cc7e49 100644 --- a/.github/workflows/linux-x86_64.yml +++ b/.github/workflows/linux-x86_64.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init @@ -48,7 +50,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init @@ -80,7 +84,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init @@ -105,7 +111,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml index b88dda4ae..e27f65b63 100644 --- a/.github/workflows/macos-aarch64.yml +++ b/.github/workflows/macos-aarch64.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml index 04f9b0fe7..e4fab9354 100644 --- a/.github/workflows/macos-x86_64.yml +++ b/.github/workflows/macos-x86_64.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init @@ -48,7 +50,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e196f77e5..88e1b454f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,9 @@ jobs: uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/windows-i686.yml b/.github/workflows/windows-i686.yml index c7c5b10e0..26c3626b0 100644 --- a/.github/workflows/windows-i686.yml +++ b/.github/workflows/windows-i686.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.github/workflows/windows-x86_64.yml b/.github/workflows/windows-x86_64.yml index 49de447f0..6178ed3b2 100644 --- a/.github/workflows/windows-x86_64.yml +++ b/.github/workflows/windows-x86_64.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init @@ -45,7 +47,9 @@ jobs: - uses: actions/checkout@v2 - uses: webfactory/ssh-agent@v0.7.0 with: - ssh-private-key: ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ssh-private-key: | + ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }} + ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }} - name: Update submodules run: | git submodule update --init diff --git a/.gitmodules b/.gitmodules index 31f7928e1..6bd2f0a97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ [submodule "playtime-clip-engine"] path = playtime-clip-engine url = git@github.com:helgoboss/playtime-clip-engine.git +[submodule "helgoboss-license-processor"] + path = helgoboss-license-processor + url = git@github.com:helgoboss/helgoboss-license-processor.git diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 8c6db7aec..6b4c885d9 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -36,6 +36,7 @@ See link:ARCHITECTURE.adoc[here]. |`/csi` |Code for interfacing with the ControlSurfaceIntegrator (CSI) project |`/dialogs` |The single source of truth for ReaLearn's GUI dialogs |`/doc` |Documentation +|`/helgoboss-license-processor` |Contains code for license processing (currently a private submodule) |`/macros` |Various Rust macros for usage in this project only |`/main` |Main crate (`realearn`) |`/playtime-api` |Playtime data structures for describing e.g. clip engine presets diff --git a/Cargo.lock b/Cargo.lock index ede95184e..6ab751382 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1243,7 +1243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.3", + "rand_core 0.6.4", "typenum", ] @@ -1670,6 +1670,7 @@ checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" dependencies = [ "curve25519-dalek", "ed25519", + "rand_core 0.6.4", "serde", "sha2", "zeroize", @@ -2516,14 +2517,16 @@ dependencies = [ [[package]] name = "helgoboss-license-processor" version = "0.1.0" -source = "git+ssh://git@github.com/helgoboss/helgoboss-license-processor.git#d2c1236ae049e8ee391aa4a354e5681dd0ee5f99" dependencies = [ "anyhow", "base64 0.21.2", + "clap", "ed25519-dalek", "helgoboss-license-api", + "rand 0.8.5", "rmp-serde", "semver 1.0.17", + "serde_json", ] [[package]] @@ -4370,14 +4373,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", + "rand_core 0.6.4", ] [[package]] @@ -4407,7 +4409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4436,9 +4438,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.9", ] @@ -4461,15 +4463,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_isaac" version = "0.1.1" @@ -5848,7 +5841,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.4", + "rand 0.8.5", "redox_syscall 0.2.10", "remove_dir_all", "winapi", @@ -6129,7 +6122,7 @@ dependencies = [ "indexmap", "pin-project", "pin-project-lite", - "rand 0.8.4", + "rand 0.8.5", "slab", "tokio", "tokio-util 0.7.3", @@ -6298,7 +6291,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.4", + "rand 0.8.5", "sha-1", "thiserror", "url", @@ -6323,7 +6316,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" dependencies = [ - "rand 0.8.4", + "rand 0.8.5", ] [[package]] diff --git a/helgoboss-license-processor b/helgoboss-license-processor new file mode 160000 index 000000000..d2c1236ae --- /dev/null +++ b/helgoboss-license-processor @@ -0,0 +1 @@ +Subproject commit d2c1236ae049e8ee391aa4a354e5681dd0ee5f99 diff --git a/playtime-clip-engine b/playtime-clip-engine index faac3d4bc..dd0f6fb2c 160000 --- a/playtime-clip-engine +++ b/playtime-clip-engine @@ -1 +1 @@ -Subproject commit faac3d4bc722e3e752f99471fa57c2224ccbd2f2 +Subproject commit dd0f6fb2c2af6c877f11cf2ed29d01c13f162074