From ca3628c4e82cf81a002a4d33b437eac9f99fb2bd Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Tue, 2 Apr 2024 11:57:00 +0200 Subject: [PATCH] Simplify Windows build steps into a single step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commands depend on each other, so I think it’s clearer if they are put into a single step. --- .github/workflows/native_build.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/native_build.yml b/.github/workflows/native_build.yml index 8022a329..5423d76b 100644 --- a/.github/workflows/native_build.yml +++ b/.github/workflows/native_build.yml @@ -18,15 +18,12 @@ jobs: - uses: dtolnay/rust-toolchain@stable - uses: ilammy/setup-nasm@v1 if: runner.os == 'Windows' - - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - if: runner.os == 'Windows' - - run: vcpkg install openssl:x64-windows-static-md sqlite3:x64-windows-static-md - if: runner.os == 'Windows' - - run: echo "OPENSSL_DIR=C:/vcpkg/packages/openssl_x64-windows-static-md" | Out-File -FilePath $env:GITHUB_ENV -Append - if: runner.os == 'Windows' - - run: curl -o C:/cacert.pem https://curl.se/ca/cacert.pem - if: runner.os == 'Windows' - - run: echo "SSL_CERT_FILE=C:/cacert.pem" | Out-File -FilePath $env:GITHUB_ENV -Append + - run: | + echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append + vcpkg install openssl:x64-windows-static-md sqlite3:x64-windows-static-md + echo "OPENSSL_DIR=C:/vcpkg/packages/openssl_x64-windows-static-md" | Out-File -FilePath $env:GITHUB_ENV -Append + curl -o C:/cacert.pem https://curl.se/ca/cacert.pem + echo "SSL_CERT_FILE=C:/cacert.pem" | Out-File -FilePath $env:GITHUB_ENV -Append if: runner.os == 'Windows' - name: Rust Fmt run: cargo fmt --all -- --check