Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
rainyl committed Apr 17, 2024
1 parent 86ed883 commit d5eea89
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 64 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/build_test.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/build_test_native_assets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches: ["native-assets"]
tags:
- "v*.*.*"
# pull_request:
# branches: [ "main" ]
pull_request:
branches: ["native-assets"]

env:
ANDROID_NDK_VERSION: r26c
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
submodules: true
- name: setup
run: |
brew install --force --overwrite ninja ccache ffmpeg nasm conan libiconv
brew install --force --overwrite ninja ccache nasm conan
conan profile detect -f
cd ${{github.workspace}}
- name: Set up Flutter
Expand Down
15 changes: 5 additions & 10 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,17 @@ class OcvDartDesktop(ConanFile):

def __init__(self, display_name=""):
super().__init__(display_name)
# pubspec = Path(str(self.options.get_safe("package_root", "."))) / "pubspec.yaml"
# output = ConanOutput(Color.YELLOW)
# output.info(f"Reading: {self.options.get_safe('package_root', '.')}")
# with open(pubspec, "r") as f:
# doc = yaml.safe_load(f)
# self.version = doc["binary_version"]
self.version = "1.0.0+2"
pubspec = Path(__file__).parent / "pubspec.yaml"
with open(pubspec, "r") as f:
doc = yaml.safe_load(f)
self.version = doc["binary_version"]
# self.version = "1.0.0+2"

def build_requirements(self):
self.tool_requires("cmake/3.28.1")
self.tool_requires("nasm/2.16.01")
if self.settings.os != "Windows":
# self.tool_requires("ffmpeg/4.4.4")
self.tool_requires("ninja/1.11.1")
# if self.settings.os == "Android":
# self.tool_requires("android-ndk/r26c")

def requirements(self):
out_dir = os.path.abspath(str(self.options.get_safe("output_dir")))
Expand Down

0 comments on commit d5eea89

Please sign in to comment.