From 0b9ae2bd1849199da1aee3db61fc0b0909ae528c Mon Sep 17 00:00:00 2001 From: Dhruvan Date: Thu, 27 Jun 2024 12:14:09 +0400 Subject: [PATCH] fix ci configs, and load xmake before running --- .github/ci/aarch64-linux-debug.sh | 3 +++ .github/ci/aarch64-linux-release.sh | 3 +++ .github/ci/aarch64-macos-debug.sh | 3 +++ .github/ci/aarch64-macos-release.sh | 3 +++ .github/ci/aarch64-windows.ps1 | 5 ++++- .github/ci/arm64-macos.sh | 0 .github/ci/x86_64-linux-debug.sh | 3 +++ .github/ci/x86_64-linux-release.sh | 3 +++ .github/ci/x86_64-macos-release.sh | 3 +++ .github/ci/x86_64-windows-debug.ps1 | 5 ++++- .github/ci/x86_64-windows-release.ps1 | 5 ++++- 11 files changed, 33 insertions(+), 3 deletions(-) delete mode 100644 .github/ci/arm64-macos.sh diff --git a/.github/ci/aarch64-linux-debug.sh b/.github/ci/aarch64-linux-debug.sh index 86de3c0a..78796b96 100644 --- a/.github/ci/aarch64-linux-debug.sh +++ b/.github/ci/aarch64-linux-debug.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m debug diff --git a/.github/ci/aarch64-linux-release.sh b/.github/ci/aarch64-linux-release.sh index 225cf628..b31d2bee 100644 --- a/.github/ci/aarch64-linux-release.sh +++ b/.github/ci/aarch64-linux-release.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m release diff --git a/.github/ci/aarch64-macos-debug.sh b/.github/ci/aarch64-macos-debug.sh index 86de3c0a..78796b96 100644 --- a/.github/ci/aarch64-macos-debug.sh +++ b/.github/ci/aarch64-macos-debug.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m debug diff --git a/.github/ci/aarch64-macos-release.sh b/.github/ci/aarch64-macos-release.sh index 225cf628..b31d2bee 100644 --- a/.github/ci/aarch64-macos-release.sh +++ b/.github/ci/aarch64-macos-release.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m release diff --git a/.github/ci/aarch64-windows.ps1 b/.github/ci/aarch64-windows.ps1 index b95c1715..bdfa1a30 100644 --- a/.github/ci/aarch64-windows.ps1 +++ b/.github/ci/aarch64-windows.ps1 @@ -1,5 +1,8 @@ +# Load xmake environment +. $env:USERPROFILE\.xmake\profile.ps1 + # setup xmake for release or debug mode -xmake f -m {'debug' if "debug" in filename else 'release'} +xmake f -m release # build and run helix-tests xmake build tests diff --git a/.github/ci/arm64-macos.sh b/.github/ci/arm64-macos.sh deleted file mode 100644 index e69de29b..00000000 diff --git a/.github/ci/x86_64-linux-debug.sh b/.github/ci/x86_64-linux-debug.sh index 86de3c0a..78796b96 100644 --- a/.github/ci/x86_64-linux-debug.sh +++ b/.github/ci/x86_64-linux-debug.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m debug diff --git a/.github/ci/x86_64-linux-release.sh b/.github/ci/x86_64-linux-release.sh index 225cf628..b31d2bee 100644 --- a/.github/ci/x86_64-linux-release.sh +++ b/.github/ci/x86_64-linux-release.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m release diff --git a/.github/ci/x86_64-macos-release.sh b/.github/ci/x86_64-macos-release.sh index 225cf628..b31d2bee 100644 --- a/.github/ci/x86_64-macos-release.sh +++ b/.github/ci/x86_64-macos-release.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load xmake environment +source ~/.xmake/profile + # setup xmake for release or debug mode xmake f -m release diff --git a/.github/ci/x86_64-windows-debug.ps1 b/.github/ci/x86_64-windows-debug.ps1 index b95c1715..faa48a77 100644 --- a/.github/ci/x86_64-windows-debug.ps1 +++ b/.github/ci/x86_64-windows-debug.ps1 @@ -1,5 +1,8 @@ +# Load xmake environment +. $env:USERPROFILE\.xmake\profile.ps1 + # setup xmake for release or debug mode -xmake f -m {'debug' if "debug" in filename else 'release'} +xmake f -m debug # build and run helix-tests xmake build tests diff --git a/.github/ci/x86_64-windows-release.ps1 b/.github/ci/x86_64-windows-release.ps1 index b95c1715..bdfa1a30 100644 --- a/.github/ci/x86_64-windows-release.ps1 +++ b/.github/ci/x86_64-windows-release.ps1 @@ -1,5 +1,8 @@ +# Load xmake environment +. $env:USERPROFILE\.xmake\profile.ps1 + # setup xmake for release or debug mode -xmake f -m {'debug' if "debug" in filename else 'release'} +xmake f -m release # build and run helix-tests xmake build tests