Compare commits

...

6 Commits

Author SHA1 Message Date
William Bell
dd750ab164 fix release.yml 2025-08-15 20:26:54 +01:00
William Bell
922b129250 fix release.yml 2025-08-15 20:18:17 +01:00
William Bell
c2df9c0e83 fix release.yml 2025-08-15 20:15:18 +01:00
William Bell
923503493e fix release.yml 2025-08-15 20:04:55 +01:00
William Bell
686cb08f11 fix conan file 2025-08-15 19:56:54 +01:00
William Bell
1cfb4acda6 fix CMakeLists.txt 2025-08-15 19:52:33 +01:00
3 changed files with 23 additions and 5 deletions

View File

@@ -26,8 +26,10 @@ jobs:
# Windows # Windows
- name: Install build tools (Windows) - name: Install build tools (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
run: choco install winflexbison -y run: |
choco install winflexbison mingw -y
shell: pwsh shell: pwsh
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
@@ -72,8 +74,20 @@ jobs:
- name: Install dependencies and build (Windows) - name: Install dependencies and build (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
run: | run: |
conan install . --build=missing conan install . \
conan build . -s compiler=gcc \
-s compiler.version=13 \
-s compiler.libcxx=libstdc++11 \
-s arch=x86_64 \
-s os=Windows \
--build=missing
conan install . \
-s compiler=gcc \
-s compiler.version=13 \
-s compiler.libcxx=libstdc++11 \
-s arch=x86_64 \
-s os=Windows \
--build=missing
shell: pwsh shell: pwsh
- name: Determine if prerelease (Linux/macOS) - name: Determine if prerelease (Linux/macOS)
@@ -136,5 +150,7 @@ jobs:
name: Release ${{ github.ref_name }} name: Release ${{ github.ref_name }}
body: Automated release based on tag ${{ github.ref_name }} body: Automated release based on tag ${{ github.ref_name }}
draft: false draft: false
updateOnlyUnreleased: true
replacesArtifacts: true
prerelease: ${{ runner.os == 'Windows' && steps.prerelease_check_win.outputs.prerelease || steps.prerelease_check_unix.outputs.prerelease }} prerelease: ${{ runner.os == 'Windows' && steps.prerelease_check_win.outputs.prerelease || steps.prerelease_check_unix.outputs.prerelease }}
artifacts: ${{ env.TAR_NAME }} artifacts: ${{ env.TAR_NAME }}

View File

@@ -52,7 +52,9 @@ find_package(BDWgc REQUIRED)
find_package(gmp REQUIRED) find_package(gmp REQUIRED)
target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s) target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
target_link_options(argon PRIVATE -static) if(NOT APPLE)
target_link_options(argon PRIVATE -static)
endif()
target_link_libraries(argon PRIVATE target_link_libraries(argon PRIVATE
BDWgc::BDWgc BDWgc::BDWgc

View File

@@ -41,7 +41,7 @@ class ArgonConan(ConanFile):
if not flex_path: if not flex_path:
raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.") raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
tc.variables["FLEX_EXECUTABLE"] = flex_path tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
tc.generate() tc.generate()
def build(self): def build(self):