Merge pull request #3 from ctreffs/feature/fix-ci

Fix ci

.travis.yml

@@ -1,24 +1,13 @@
-os:
-  - linux
-  - osx
-language: generic
-sudo: required
-dist: trusty
-osx_image: xcode11
+language: swift
+jobs:
+  include:
+    - os: linux
+      dist: bionic
+      language: generic
+    - os: osx
+      osx_image: xcode11.3
+      language: swift
 install:
   - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 script:
-  - swift package reset
-  - swift build
-  - swift test
-env:
-  - BADGE=linux
-  - BADGE=osx
-# hack to get some OS-specific badges 
-# see: https://github.com/travis-ci/travis-ci/issues/9579
-matrix:
-  exclude:
-    - os: linux
-      env: BADGE=osx
-    - os: osx
-      env: BADGE=linux
+  - make runCI

Makefile

@@ -37,6 +37,14 @@ buildCImGui: updateCLibImGui generateCInterface copyLibImGui
 buildAutoWrapper:
 	swift build -c release --product AutoWrapper
 
+buildRelease:
+	swift build -c release -Xcxx -Wno-modules-import-nested-redundant -Xcxx -Wno-return-type-c-linkage
+
+runCI:
+	swift package reset
+	swift build -c release -Xcxx -Wno-modules-import-nested-redundant -Xcxx -Wno-return-type-c-linkage -Xcc -Wno-modules-import-nested-redundant -Xcc -Wno-return-type-c-linkage
+	swift test -Xcxx -Wno-modules-import-nested-redundant -Xcxx -Wno-return-type-c-linkage -Xcc -Wno-modules-import-nested-redundant -Xcc -Wno-return-type-c-linkage
+
 wrapLibImGui: buildAutoWrapper
 	$(release_dir)/AutoWrapper $(imgui_src)/generator/output/definitions.json $(swift_imgui_src)/ImGui+Definitions.swift
 

Tests/ImGuiTests/ImGuiTests.swift

@@ -1,18 +1,20 @@
 import ImGui
 import XCTest
 
-public final class ImGuiTests: XCTestCase {
-    func testVersion() {
+final class ImGuiTests: XCTestCase {
+    func testImGuiVersion() {
         XCTAssertNotNil(ImGuiGetVersion())
-        XCTAssertEqual(ImGuiGetVersion(), "1.74 WIP")
         IMGUI_CHECKVERSION()
     }
 
     func testCreateContext() {
         XCTAssertNotNil(ImGuiCreateContext(nil))
+        ImGuiDestroyContext(ImGuiGetCurrentContext())
     }
 
     func testGetIO() {
+        XCTAssertNotNil(ImGuiCreateContext(nil))
         XCTAssertNotNil(ImGuiGetIO())
+        ImGuiDestroyContext(ImGuiGetCurrentContext())
     }
 }

Tests/ImGuiTests/XCTestManifests.swift

@@ -8,7 +8,7 @@ extension ImGuiTests {
     static let __allTests__ImGuiTests = [
         ("testCreateContext", testCreateContext),
         ("testGetIO", testGetIO),
-        ("testVersion", testVersion)
+        ("testImGuiVersion", testImGuiVersion)
     ]
 }