From bb10a5acbb997f394a67c418cad9ad55191e4f93 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Mon, 13 Oct 2025 13:00:35 +0200 Subject: [PATCH 1/2] Fix Windows build by using GitHub Actions expressions directly PowerShell doesn't expand $VARIABLE the same way bash does. Using ${{ matrix.targets.target }} directly in the run commands fixes this. --- .github/workflows/nifi_migrate_release.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nifi_migrate_release.yaml b/.github/workflows/nifi_migrate_release.yaml index f2a130d..ff852ca 100644 --- a/.github/workflows/nifi_migrate_release.yaml +++ b/.github/workflows/nifi_migrate_release.yaml @@ -46,21 +46,15 @@ jobs: targets: ${{ matrix.targets.target }} - name: Build Binary - env: - TARGET: ${{ matrix.targets.target }} - run: cargo build --target "$TARGET" --release --package nifi-migrate + run: cargo build --target "${{ matrix.targets.target }}" --release --package nifi-migrate - name: Rename Binary (Unix) if: runner.os != 'Windows' - env: - TARGET: ${{ matrix.targets.target }} - run: mv "target/$TARGET/release/nifi-migrate" "nifi-migrate-$TARGET" + run: mv "target/${{ matrix.targets.target }}/release/nifi-migrate" "nifi-migrate-${{ matrix.targets.target }}" - name: Rename Binary (Windows) if: runner.os == 'Windows' - env: - TARGET: ${{ matrix.targets.target }} - run: mv "target/$TARGET/release/nifi-migrate.exe" "nifi-migrate-$TARGET.exe" + run: mv "target/${{ matrix.targets.target }}/release/nifi-migrate.exe" "nifi-migrate-${{ matrix.targets.target }}.exe" - name: Upload Artifact to Release uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2 From c91816c70b7e8b7d7d533571e9aafd4cacfaa470 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Mon, 13 Oct 2025 13:03:18 +0200 Subject: [PATCH 2/2] Fix Windows build by using GitHub Actions expressions directly PowerShell doesn't expand $VARIABLE the same way bash does. Using ${{ matrix.targets.target }} directly in the run commands fixes this. --- .github/workflows/nifi_migrate_pr.yaml | 5 ++--- .github/workflows/nifi_migrate_release.yaml | 6 +++--- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nifi_migrate_pr.yaml b/.github/workflows/nifi_migrate_pr.yaml index 712bd70..fcab4fc 100644 --- a/.github/workflows/nifi_migrate_pr.yaml +++ b/.github/workflows/nifi_migrate_pr.yaml @@ -48,6 +48,7 @@ jobs: - { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } - { target: aarch64-apple-darwin, os: macos-latest } + - { target: x86_64-pc-windows-msvc, os: windows-latest } runs-on: ${{ matrix.targets.os }} steps: - name: Checkout @@ -61,6 +62,4 @@ jobs: targets: ${{ matrix.targets.target }} - name: Build Binary - env: - TARGET: ${{ matrix.targets.target }} - run: cargo build --target "$TARGET" --package nifi-migrate + run: cargo build --target ${{ matrix.targets.target }} --package nifi-migrate diff --git a/.github/workflows/nifi_migrate_release.yaml b/.github/workflows/nifi_migrate_release.yaml index ff852ca..1032cb3 100644 --- a/.github/workflows/nifi_migrate_release.yaml +++ b/.github/workflows/nifi_migrate_release.yaml @@ -46,15 +46,15 @@ jobs: targets: ${{ matrix.targets.target }} - name: Build Binary - run: cargo build --target "${{ matrix.targets.target }}" --release --package nifi-migrate + run: cargo build --target ${{ matrix.targets.target }} --release --package nifi-migrate - name: Rename Binary (Unix) if: runner.os != 'Windows' - run: mv "target/${{ matrix.targets.target }}/release/nifi-migrate" "nifi-migrate-${{ matrix.targets.target }}" + run: mv target/${{ matrix.targets.target }}/release/nifi-migrate nifi-migrate-${{ matrix.targets.target }} - name: Rename Binary (Windows) if: runner.os == 'Windows' - run: mv "target/${{ matrix.targets.target }}/release/nifi-migrate.exe" "nifi-migrate-${{ matrix.targets.target }}.exe" + run: mv target/${{ matrix.targets.target }}/release/nifi-migrate.exe nifi-migrate-${{ matrix.targets.target }}.exe - name: Upload Artifact to Release uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 07c1759..d975f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## 0.1.1 - 2025-10-13 + +- Fix Windows build ([#6]) + +[#6]: https://github.com/stackabletech/nifi-migrate/pull/6 + ## 0.1.0 - 2025-10-13 ### Added diff --git a/Cargo.lock b/Cargo.lock index 6871000..baf78d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,7 +136,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "nifi-migrate" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index b45996e..7973ca9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nifi-migrate" -version = "0.1.0" +version = "0.1.1" edition = "2024" license = "Apache-2.0" authors = ["Stackable GmbH "]