Compare commits

...

11 Commits

Author SHA1 Message Date
William Bell
4a1ed23f96 fix release.yml 2025-08-15 22:05:57 +01:00
William Bell
eb36d02fcb fix release.yml 2025-08-15 22:03:23 +01:00
William Bell
7b3a1e1835 fix release.yml 2025-08-15 21:52:16 +01:00
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
3 changed files with 23 additions and 13 deletions

View File

@@ -105,9 +105,17 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: Install build tools - name: Install MSYS2 and build tools
run: choco install winflexbison mingw -y uses: msys2/setup-msys2@v3
shell: pwsh with:
update: true
install: >
mingw-w64-x86_64-toolchain
mingw-w64-x86_64-gmp
mingw-w64-x86_64-make
mingw-w64-x86_64-flex
mingw-w64-x86_64-bison
shell: msys2 {0}
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
@@ -123,15 +131,8 @@ jobs:
- name: Build with MinGW - name: Build with MinGW
run: | run: |
conan install . ` make
-s compiler=gcc ` shell: msys2 {0}
-s compiler.version=13 `
-s compiler.libcxx=libstdc++11 `
-s arch=x86_64 `
-s os=Windows `
--build=missing
conan build .
shell: pwsh
- name: Package - name: Package
run: | run: |
@@ -139,7 +140,7 @@ jobs:
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
$FOLDER = "chloride-$TAG-windows-$ARCH" $FOLDER = "chloride-$TAG-windows-$ARCH"
$ZIP = "$FOLDER.zip" $ZIP = "$FOLDER.zip"
Rename-Item build\bin $FOLDER Rename-Item bin $FOLDER
Copy-Item LICENSE.txt $FOLDER Copy-Item LICENSE.txt $FOLDER
Compress-Archive -Path $FOLDER -DestinationPath $ZIP Compress-Archive -Path $FOLDER -DestinationPath $ZIP
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV

View File

@@ -0,0 +1,8 @@
[settings]
os=Windows
arch=x86_64
compiler=gcc
compiler.version=13
compiler.cppstd=gnu17
compiler.libcxx=libstdc++11
build_type=Release

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