update workflow and fix tests

steinwurf · Oct 8, 2024 · a8b8c1d · a8b8c1d
1 parent 224c3c7
commit a8b8c1d
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 27 deletions.
diff --git a/.github/workflows/python-waf.yml b/.github/workflows/python-waf.yml
@@ -14,7 +14,7 @@ name: Waf Python Tests
 jobs:
   waf-linux:
     container:
-      image: ghcr.io/steinwurf/waf:latest
+      image: python:3.12
       options: --user 0:0
       volumes:
       - /home/buildbot/.ssh:/root/.ssh

diff --git a/test/add_dependency/app/wscript b/test/add_dependency/app/wscript
@@ -8,6 +8,8 @@ from fake_git import FakeGit
 APPNAME = "test_add_dependency"
 VERSION = "1.0.0"
 
+NO_RECURSE = False
+
 
 def resolve(ctx):
     # Get the registry and replace the git builder

diff --git a/test/add_dependency/libbar/wscript b/test/add_dependency/libbar/wscript
@@ -5,6 +5,9 @@ APPNAME = "libbar"
 VERSION = "1.0.0"
 
 
+NO_RECURSE = False
+
+
 def options(opt):
     opt.load("compiler_cxx")
 

diff --git a/test/add_dependency/libbaz/wscript b/test/add_dependency/libbaz/wscript
@@ -5,6 +5,9 @@ APPNAME = "libbaz"
 VERSION = "1.0.0"
 
 
+NO_RECURSE = False
+
+
 def resolve(ctx):
     pass
 

diff --git a/test/add_dependency/libextra/wscript b/test/add_dependency/libextra/wscript
@@ -3,6 +3,8 @@
 
 VERSION = "1.0.0"
 
+NO_RECURSE = False
+
 
 def build(bld):
     bld(export_includes="./src", name="extra")
diff --git a/test/add_dependency/libfoo/wscript b/test/add_dependency/libfoo/wscript
@@ -4,6 +4,9 @@
 VERSION = "1.0.0"
 
 
+NO_RECURSE = False
+
+
 def options(opt):
     opts = opt.add_option_group("Foo options")
     opts.add_option(

diff --git a/test/existing_tag/app/wscript b/test/existing_tag/app/wscript
@@ -6,6 +6,8 @@ from fake_git import FakeGit
 APPNAME = "test_add_dependency"
 VERSION = "1.0.0"
 
+NO_RECURSE = False
+
 
 def resolve(ctx):
     # Get the registry and replace the git builder

diff --git a/test/existing_tag/libbaz/wscript b/test/existing_tag/libbaz/wscript
@@ -1,24 +1,26 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-APPNAME = 'libbaz'
-VERSION = '1.0.0'
+APPNAME = "libbaz"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
 
 
 def resolve(ctx):
     pass
 
 
 def options(opt):
-    opt.load('compiler_cxx')
+    opt.load("compiler_cxx")
 
 
 def configure(conf):
-    conf.load('compiler_cxx')
+    conf.load("compiler_cxx")
 
 
 def build(bld):
-    bld.stlib(features='cxx',
-              target='baz',
-              source='src/baz/baz.cpp',
-              export_includes='src')
+    bld.stlib(
+        features="cxx", target="baz", source="src/baz/baz.cpp", export_includes="src"
+    )
diff --git a/test/fail_recurse/wscript b/test/fail_recurse/wscript
@@ -1,8 +1,11 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-APPNAME = 'fail_recurse'
-VERSION = '1.0.0'
+APPNAME = "fail_recurse"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
 
 
 def resolve(ctx):

diff --git a/test/fail_recurse/wscript_build_python_error b/test/fail_recurse/wscript_build_python_error
@@ -1,11 +1,16 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-APPNAME = 'foo'
-VERSION = '1.0.0'
+APPNAME = "foo"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
+
 
 def configure(conf):
     pass
 
+
 def build(conf):
     raise RuntimeError("Oh no!")
diff --git a/test/fail_recurse/wscript_build_waf_error b/test/fail_recurse/wscript_build_waf_error
@@ -3,11 +3,16 @@
 
 import waflib
 
-APPNAME = 'foo'
-VERSION = '1.0.0'
+APPNAME = "foo"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
+
 
 def configure(conf):
     pass
 
+
 def build(bld):
     raise waflib.Errors.WafError("Oh no!")
diff --git a/test/fail_recurse/wscript_configure_python_error b/test/fail_recurse/wscript_configure_python_error
@@ -1,8 +1,12 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-APPNAME = 'foo'
-VERSION = '1.0.0'
+APPNAME = "foo"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
+
 
 def configure(conf):
     raise RuntimeError("Oh no!")
diff --git a/test/fail_recurse/wscript_configure_waf_error b/test/fail_recurse/wscript_configure_waf_error
@@ -3,8 +3,12 @@
 
 import waflib
 
-APPNAME = 'foo'
-VERSION = '1.0.0'
+APPNAME = "foo"
+VERSION = "1.0.0"
+
+
+NO_RECURSE = False
+
 
 def configure(conf):
     raise waflib.Errors.WafError("Oh no!")
diff --git a/test/pull_submodules/app/wscript b/test/pull_submodules/app/wscript
@@ -7,6 +7,8 @@ from fake_git import FakeGit
 APPNAME = "test_add_dependency"
 VERSION = "1.0.0"
 
+NO_RECURSE = False
+
 
 def resolve(ctx):
 

diff --git a/test/pull_submodules/libbaz/wscript b/test/pull_submodules/libbaz/wscript
@@ -1,24 +1,25 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-APPNAME = 'libbaz'
-VERSION = '1.0.0'
+APPNAME = "libbaz"
+VERSION = "1.0.0"
+
+NO_RECURSE = False
 
 
 def resolve(ctx):
     pass
 
 
 def options(opt):
-    opt.load('compiler_cxx')
+    opt.load("compiler_cxx")
 
 
 def configure(conf):
-    conf.load('compiler_cxx')
+    conf.load("compiler_cxx")
 
 
 def build(bld):
-    bld.stlib(features='cxx',
-              target='baz',
-              source='src/baz/baz.cpp',
-              export_includes='src')
+    bld.stlib(
+        features="cxx", target="baz", source="src/baz/baz.cpp", export_includes="src"
+    )