From 7982d02e45cee25460dd03a9d4ac55bacbcc7db2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 8 Nov 2019 17:31:34 -0600 Subject: [PATCH] Move top-level `installer` directory to `ci` (#527) A small amount of cleanup for the top-level of this repository, where the `installer` directory just had one misc file for the Windows installer which we can put elsewhere inside of `ci`, another misc folder but one that already has a few files in it. --- .github/workflows/main.yml | 4 ++-- {installer/msi => ci}/wasmtime.wxs | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename {installer/msi => ci}/wasmtime.wxs (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 699f4bc8ff..61ddb550fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -207,7 +207,7 @@ jobs: submodules: true - uses: ./.github/actions/install-rust - uses: ./.github/actions/binary-compatible-builds - + # Install wasm32-wasi target in order to build wasi-common's integration # tests - run: rustup target add wasm32-wasi @@ -249,7 +249,7 @@ jobs: # Make a Windows MSI installer if we're on Windows - run: | export WT_VERSION=`cat Cargo.toml | sed -n 's/^version = "\([^"]*\)".*/\1/p'` - "$WIX/bin/candle" -arch x64 -out target/wasmtime.wixobj installer/msi/wasmtime.wxs + "$WIX/bin/candle" -arch x64 -out target/wasmtime.wixobj ci/wasmtime.wxs "$WIX/bin/light" -out dist/installer.msi target/wasmtime.wixobj -ext WixUtilExtension rm dist/installer.wixpdb shell: bash diff --git a/installer/msi/wasmtime.wxs b/ci/wasmtime.wxs similarity index 100% rename from installer/msi/wasmtime.wxs rename to ci/wasmtime.wxs