From c9219e671c2a4f83b51c2bc6557ea663ae9b69d0 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 10:10:24 +0100 Subject: [PATCH 1/6] feat: build targets for windows, linux, mac-arm --- .github/workflows/deploy.yml | 40 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f64420b..5906873 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,36 +11,16 @@ jobs: strategy: matrix: name: - # - linux-x86-64-gnu - # - linux-x86-64-musl - # - linux-armhf-gnu - # - linux-arm64-gnu + - linux-x86-64-gnu - mac-x86-64 - mac-arm64 + - windows-gnu include: - # - name: linux-x86-64-gnu - # os: ubuntu-20.04 - # target: x86_64-unknown-linux-gnu - # cross: false - # experimental: false - - # - name: linux-x86-64-musl - # os: ubuntu-latest - # target: x86_64-unknown-linux-musl - # cross: true - # experimental: false - - # - name: linux-armhf-gnu - # os: ubuntu-20.04 - # target: armv7-unknown-linux-gnueabihf - # cross: true - # experimental: false - - # - name: linux-arm64-gnu - # os: ubuntu-20.04 - # target: aarch64-unknown-linux-gnu - # cross: true - # experimental: false + - name: linux-x86-64-gnu + os: ubuntu-20.04 + target: x86_64-unknown-linux-gnu + cross: false + experimental: false - name: mac-x86-64 os: macos-latest @@ -53,6 +33,12 @@ jobs: target: aarch64-apple-darwin cross: true experimental: true + + - name: windows-gnu + os: windows-latest + target: x86_64-pc-windows-gnu + cross: true + experimental: false name: Binaries for ${{ matrix.name }} runs-on: ${{ matrix.os }} From 6cdbbeedd0a8419af0f5bcfc1024185287ff4d88 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 10:23:47 +0100 Subject: [PATCH 2/6] fix: upload and add windows binary to release --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5906873..e504e10 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -111,6 +111,7 @@ jobs: retention-days: 1 path: | keyweave-*.tar.xz + keyweave.exe sign: needs: build @@ -143,4 +144,5 @@ jobs: fail_on_unmatched_files: true files: | keyweave-*.tar.xz + keyweave.exe *SUMS* \ No newline at end of file From bbf32039a755c18dd0b222bf147345d3bf776f0a Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 10:37:31 +0100 Subject: [PATCH 3/6] docs: correct git clone url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75486b9..2199888 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Keyweave is an open-source tool designed to seamlessly fetch secrets from Azure Clone the repository to your local machine: ```sh -git clone https://github.com/your-username/keyweave.git +git clone https://github.com/bartvdbraak/keyweave.git cd keyweave ``` From ef8b8f342aa8208ec23b4257cc5ec3c64eb826b3 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 10:38:48 +0100 Subject: [PATCH 4/6] fix: use full path dir for x86_64-pc-windows-gnu --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e504e10..7f61ed9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -111,7 +111,7 @@ jobs: retention-days: 1 path: | keyweave-*.tar.xz - keyweave.exe + keyweave-x86_64-pc-windows-gnu/keyweave.exe sign: needs: build From 92c5a4256b3c464032de885567fbdeb96ba1be56 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 10:48:30 +0100 Subject: [PATCH 5/6] fix: use wildcard pattern for win executable --- .github/workflows/{deploy.yml => release.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{deploy.yml => release.yml} (99%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/release.yml similarity index 99% rename from .github/workflows/deploy.yml rename to .github/workflows/release.yml index 7f61ed9..c5ecd60 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/release.yml @@ -144,5 +144,5 @@ jobs: fail_on_unmatched_files: true files: | keyweave-*.tar.xz - keyweave.exe + keyweave-*/keyweave.exe *SUMS* \ No newline at end of file From b8b0f85d4ff0d6925e11a468b931f3ad376ff7c3 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Nov 2023 11:01:04 +0100 Subject: [PATCH 6/6] docs: add correct license reference --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2199888..7aa1dad 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ cargo run -- --vault_name my-key-vault --output my-env-file.env --filter my-secr ## License -Keyweave is licensed under the MIT License. See [LICENSE](LICENSE) for more details. +Keyweave is licensed under the GLPv3 License. See [LICENSE](LICENSE) for more details. ## Contributing