diff options
| -rw-r--r-- | .github/workflows/test.yml | 23 | ||||
| -rw-r--r-- | wrappers/java-android/Makefile | 2 | ||||
| -rwxr-xr-x | wrappers/python/setup.py | 2 | ||||
| -rw-r--r-- | wrappers/swift/Package.swift | 3 |
4 files changed, 21 insertions, 9 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1108a55..054b52a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test +name: Test & check build on: [ push, pull_request ] @@ -44,7 +44,10 @@ jobs: with: name: shared-lib path: exports/lib/ - - run: make -C wrappers/csharp + - name: Test + run: make -C wrappers/csharp + - name: Build .nupkg + run: make -C wrappers/csharp pack test-java-android: name: Test Android (Java) wrapper @@ -63,7 +66,10 @@ jobs: with: name: shared-lib path: exports/lib/ - - run: make -C wrappers/java-android NO_DAEMON=1 NO_EMULATOR=1 + - name: Test + run: make -C wrappers/java-android test NO_DAEMON=1 NO_EMULATOR=1 + - name: Build .aar + run: make -C wrappers/java-android pack NO_DAEMON=1 NO_EMULATOR=1 test-php: name: Test PHP wrapper @@ -78,7 +84,8 @@ jobs: with: name: shared-lib path: exports/lib/ - - run: make -C wrappers/php + - name: Test + run: make -C wrappers/php test test-python: name: Test Python wrapper @@ -93,7 +100,10 @@ jobs: with: name: shared-lib path: exports/lib/ - - run: make -C wrappers/python + - name: Test + run: make -C wrappers/python test + - name: Build .whl + run: make -C wrappers/python pack test-swift: name: Test Swift wrapper @@ -108,4 +118,5 @@ jobs: with: name: shared-lib path: exports/lib/ - - run: make -C wrappers/swift + - name: test + run: make -C wrappers/swift diff --git a/wrappers/java-android/Makefile b/wrappers/java-android/Makefile index 1082aed..9d9ca79 100644 --- a/wrappers/java-android/Makefile +++ b/wrappers/java-android/Makefile @@ -10,6 +10,8 @@ endif build: ./gradlew $(GRADLE_FLAGS) assembleRelease +pack: build + # Unit tests use library for desktop OS platform, so we still need .try-build-lib for this # The unit tests find this library through the library path set in common.mk unit-test: .try-build-lib diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py index 9e7bde4..a1ce1ee 100755 --- a/wrappers/python/setup.py +++ b/wrappers/python/setup.py @@ -76,7 +76,7 @@ class bdist_wheel(_bdist_wheel): print(f"Building wheel for platform {self.plat_name}") # setuptools will only use paths inside the package for package_data, so we copy the library - tmp_lib = shutil.copy2(f"{self.exports_lib_path}/{libpath}", "eduvpncommon/lib/") + tmp_lib = shutil.copy(f"{self.exports_lib_path}/{libpath}", "eduvpncommon/lib/") _bdist_wheel.run(self) os.remove(tmp_lib) diff --git a/wrappers/swift/Package.swift b/wrappers/swift/Package.swift index bb6f8e9..5b675ac 100644 --- a/wrappers/swift/Package.swift +++ b/wrappers/swift/Package.swift @@ -1,5 +1,4 @@ -// swift-tools-version:5.1 -//TODO ^ find out minimal version +// swift-tools-version:5.0 import PackageDescription |