Compare commits
2 Commits
prerelease
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b6e785638 | ||
|
|
51e82e5b2e |
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
@@ -63,7 +63,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Determine if prerelease (Linux/macOS)
|
- name: Determine if prerelease (Linux/macOS)
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
id: prerelease_check
|
id: prerelease_check_unix
|
||||||
run: |
|
run: |
|
||||||
TAG=${GITHUB_REF##refs/tags/}
|
TAG=${GITHUB_REF##refs/tags/}
|
||||||
if [[ "$TAG" == prerelease-* ]]; then
|
if [[ "$TAG" == prerelease-* ]]; then
|
||||||
@@ -76,7 +76,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Determine if prerelease (Windows)
|
- name: Determine if prerelease (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
id: prerelease_check
|
id: prerelease_check_win
|
||||||
run: |
|
run: |
|
||||||
$TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
|
$TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
|
||||||
if ($TAG -like 'prerelease-*') {
|
if ($TAG -like 'prerelease-*') {
|
||||||
@@ -121,5 +121,5 @@ 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
|
||||||
prerelease: ${{ steps.prerelease_check.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 }}
|
||||||
@@ -31,18 +31,11 @@ class ArgonConan(ConanFile):
|
|||||||
def generate(self):
|
def generate(self):
|
||||||
tc = CMakeToolchain(self)
|
tc = CMakeToolchain(self)
|
||||||
|
|
||||||
# Try to find flex in system PATH first
|
|
||||||
flex_path = which("flex")
|
flex_path = which("flex")
|
||||||
|
|
||||||
# If not found, fallback to flex from Conan build requirements
|
|
||||||
if not flex_path:
|
if not flex_path:
|
||||||
flex_dep = self.dependencies.build.get("flex", None)
|
raise Exception("Flex not found in system PATH. Please install flex on your system.")
|
||||||
if not flex_dep:
|
|
||||||
raise Exception("Flex not found in system PATH and not declared as build requirement")
|
|
||||||
flex_path = join(flex_dep.package_folder, "bin", "flex")
|
|
||||||
|
|
||||||
tc.variables["FLEX_EXECUTABLE"] = flex_path
|
tc.variables["FLEX_EXECUTABLE"] = flex_path
|
||||||
|
|
||||||
tc.generate()
|
tc.generate()
|
||||||
|
|
||||||
def build(self):
|
def build(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user