From 86e923692fd5d4bb5960cd5000dc20c9fef82587 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sat, 21 Oct 2023 14:44:52 +0100 Subject: [PATCH 1/3] Add visual studio CI tests --- .github/workflows/ci.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfee224..f9f580e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,21 +11,25 @@ on: - master jobs: - # visual-studio: - # timeout-minutes: 60 - # runs-on: windows-latest + visual-studio: + timeout-minutes: 60 + runs-on: windows-latest + name: Visual Studio + steps: + - uses: actions/checkout@v3 + - uses: ilammy/msvc-dev-cmd@v1 + - name: Install vcpkg dependencies + run: | + vcpkg install --triplet x64-windows gtkmm plplot pkgconf + - name: Build with meson + run: | + # set PKG_CONFIG_PATH to allow pkgconf to find the pkg-config files + $Env:PKG_CONFIG_PATH = "C:\vcpkg\installed\x64-windows\lib\pkgconfig" - # steps: - # - uses: actions/checkout@v4 - # - name: Setup python - # uses: actions/setup-python@v1 - # with: - # python-version: 3.8 - # - uses: ilammy/msvc-dev-cmd@v1 - # - uses: BSFishy/meson-build@v1.0.1 - # with: - # action: test - # setup-options: -Dwith-fortran=false + meson setup meson-build --buildtype=release + meson compile -C meson-build + env: + PKG_CONFIG: C:\vcpkg\installed\x64-windows\tools\pkgconf\pkgconf.exe macos: timeout-minutes: 60 From 1de8343c835222b3c307cfd4aa34e91339114fc9 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sat, 21 Oct 2023 16:00:16 +0100 Subject: [PATCH 2/3] Use action to install --- .github/workflows/ci.yml | 14 ++++++++++---- vcpkg.json | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 vcpkg.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9f580e..22806ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,15 +12,21 @@ on: jobs: visual-studio: - timeout-minutes: 60 + timeout-minutes: 180 runs-on: windows-latest name: Visual Studio steps: + # - uses: lukka/get-cmake@latest - uses: actions/checkout@v3 + - name: Install vcpkg deps + uses: lukka/run-vcpkg@v11 + with: + vcpkgGitCommitId: "8eb57355a4ffb410a2e94c07b4dca2dffbee8e50" # "2023.10.19" + runVcpkgInstall: true - uses: ilammy/msvc-dev-cmd@v1 - - name: Install vcpkg dependencies - run: | - vcpkg install --triplet x64-windows gtkmm plplot pkgconf + # - name: Install vcpkg dependencies + # run: | + # vcpkg install --triplet x64-windows gtkmm plplot pkgconf - name: Build with meson run: | # set PKG_CONFIG_PATH to allow pkgconf to find the pkg-config files diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..8265db7 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + "boost-multi-array", + "plplot", + "gtkmm" + ] + } \ No newline at end of file From 19dda3f5bb5ae88b11b35c9a5c7efc773053eda3 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Fri, 29 Dec 2023 15:25:54 +0100 Subject: [PATCH 3/3] Bump vcpkg commit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22806ea..21aa685 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Install vcpkg deps uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: "8eb57355a4ffb410a2e94c07b4dca2dffbee8e50" # "2023.10.19" + vcpkgGitCommitId: "c8696863d371ab7f46e213d8f5ca923c4aef2a00" # "2023.10.19" runVcpkgInstall: true - uses: ilammy/msvc-dev-cmd@v1 # - name: Install vcpkg dependencies