Compare commits

..

8 Commits

Author SHA1 Message Date
William Bell
8e53579682 fix release.yml 2025-08-15 21:36:51 +01:00
William Bell
0d8f262185 this thing is really annoying me now 2025-08-15 21:34:31 +01:00
William Bell
fc6f41d89b fix release.yml 2025-08-15 21:30:01 +01:00
William Bell
6a7ce72eb7 fix cmake 2025-08-15 21:23:08 +01:00
William Bell
f84e5429a5 fix release.yml 2025-08-15 21:16:48 +01:00
William Bell
f4c7294267 fix release.yml 2025-08-15 21:14:17 +01:00
William Bell
be4b04a286 fix release.yml 2025-08-15 20:59:49 +01:00
William Bell
9d11122e93 fix conanfile.py 2025-08-15 20:50:58 +01:00
2 changed files with 19 additions and 24 deletions

View File

@@ -99,15 +99,14 @@ jobs:
path: ${{ env.TAR_NAME }} path: ${{ env.TAR_NAME }}
build-windows: build-windows:
runs-on: windows-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Install build tools - name: Install MinGW-w64 for cross-compilation
run: choco install winflexbison mingw -y run: sudo apt-get update && sudo apt-get install -y mingw-w64
shell: pwsh
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@@ -119,31 +118,26 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install conan pip install conan
conan profile detect conan profile detect
shell: pwsh conan profile update settings.compiler.version=13 default
conan profile update settings.compiler=gcc default
conan profile update settings.os=Windows default
conan profile update env.CC=x86_64-w64-mingw32-gcc default
conan profile update env.CXX=x86_64-w64-mingw32-g++ default
- name: Build with MinGW - name: Build Windows with MinGW
run: | run: |
conan install . ` conan install . --profile:host=mingw-windows --profile:build=default --build=missing
-s compiler=gcc `
-s compiler.version=13 `
-s compiler.libcxx=libstdc++11 `
-s arch=x86_64 `
-s os=Windows `
--build=missing
conan build . conan build .
shell: pwsh
- name: Package - name: Package Windows build
run: | run: |
$TAG = $env:GITHUB_REF -replace 'refs/tags/', '' TAG=${GITHUB_REF##refs/tags/}
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } FOLDER="chloride-$TAG-windows-x64"
$FOLDER = "chloride-$TAG-windows-$ARCH" ZIP="$FOLDER.zip"
$ZIP = "$FOLDER.zip" mv build/bin "$FOLDER"
Rename-Item build\bin $FOLDER cp LICENSE.txt "$FOLDER"
Copy-Item LICENSE.txt $FOLDER zip -r "$ZIP" "$FOLDER"
Compress-Archive -Path $FOLDER -DestinationPath $ZIP echo "TAR_NAME=$ZIP" >> $GITHUB_ENV
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
shell: pwsh
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View File

@@ -30,6 +30,7 @@ class ArgonConan(ConanFile):
self.folders.generators = "build" self.folders.generators = "build"
def generate(self): def generate(self):
os.environ["CONAN_NON_INTERACTIVE"] = "1"
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
if os.name == "nt": # Windows if os.name == "nt": # Windows