Merge pull request #19

Enable Windows GitHub actions

Author: steve-s

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest] # TODO: windows-latest
+        os: [ubuntu-latest, macos-latest, windows-latest]
         test_name: [ test_jbang_integration.py, test_maven_plugin.py, test_gradle_plugin.py ]
         include:
           # We need to skip native-image tests on Gradle and MacOS runners: it seems that with
@@ -176,6 +176,14 @@ jobs:
         run: choco install jbang
         shell: pwsh
 
+      # - name: Setup MSVC on Windows
+      #   if: runner.os == 'Windows'
+      #   uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Add git utils to $PATH on Windows
+        if: runner.os == 'Windows'
+        run: echo "C:\Program Files\Git\usr\bin" >> $env:GITHUB_PATH
+
       - name: Run integration tests
         run: |
           mvn --batch-mode -s settings.xml -Dgradle.java.home=$GRADLE_JAVA_HOME exec:java@integration-tests -Dintegration.tests.args="${{ matrix.test_name }} ${{ matrix.extra_test_args }} $TEST_FLAGS"
@@ -193,11 +201,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest] # TODO: windows-latest
+        os: [ubuntu-latest, macos-latest, windows-latest]
         tests: [unit-cp, unit-mp, unit-it-mp, isolate-it]
-        exclude: # TODO: find out why the resources are not in the bundle (the same for Windows)
+        exclude: # TODO: isolate resources seem to not be in the bundle for those
           - os: macos-latest
             tests: isolate-it
+          - os: windows-latest
+            tests: isolate-it
         include:
           - tests: unit-cp
             maven_args: "test"

.github/workflows/tests-release-jbang.yml

@@ -23,6 +23,6 @@ jobs:
       - name: Run JBang integration tests
         run: |
           mvn --batch-mode exec:java@integration-tests \
-              -Dproject.polyglot.version=24.1.2 \
+              -Dproject.polyglot.version=24.2.2 \
               -Dintegration.tests.args="test_jbang_integration.py \
-              --jbang-graalpy-version=24.2.1"
+              --jbang-graalpy-version=24.2.2"

integration-tests/test_gradle_plugin.py

@@ -585,6 +585,7 @@ def __init__(self, *args, **kwargs):
     def setUpClass(cls):
         super().setUpClass()
 
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_gradle_generated_app(self):
         self.check_gradle_generated_app(community=True)
 
@@ -749,6 +750,7 @@ def setUpClass(cls):
         super().setUpClass()
 
     @long_running_test
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_gradle_generated_app(self):
         self.check_gradle_generated_app(community=True)
 

integration-tests/test_jbang_integration.py

@@ -208,6 +208,7 @@ def test_hello_example(self):
             self.assertIn("Successfully installed termcolor", out)
             self.assertIn("hello java", out)
 
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_external_dir(self):
         work_dir = self.tmpdir
         hello_java_file = self.prepare_hello_example(work_dir)

integration-tests/test_maven_plugin.py

@@ -187,6 +187,7 @@ def check_generated_app(self, use_default_vfs_path):
             util.check_ouput("not compatible with the current platform", out, logger=log)
 
 
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_generated_app(self):
         self.check_generated_app(use_default_vfs_path=False)
 
@@ -577,6 +578,7 @@ def _prepare_multi_project(self, tmpdir, app1_pom_template_name, app2_pom_templa
         return app1_dir, app1_mvnw_cmd, app2_dir, app2_mvnw_cmd
 
     @long_running_test
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_multiple_merged_vfs(self):
         if not util.native_image_all():
             self.skipTest("native-image tests disabled")
@@ -657,6 +659,7 @@ def test_multiple_merged_vfs(self):
             assert return_code == 0, out
 
 
+    @util.skip_on_windows("ujson installation broken on Windows")
     def test_multiple_vfs_incompat_libs_error(self):
         with util.TemporaryTestDirectory() as tmpdir:
             app1_dir, app1_mvnw_cmd, app2_dir, app2_mvnw_cmd = \

integration-tests/util.py

@@ -70,6 +70,9 @@ def native_image_smoke():
 def long_running_test(func):
     return unittest.skipIf(long_running_test_disabled, "passed option --skip-long-running")(func)
 
+def skip_on_windows(justification):
+    return unittest.skipIf(sys.platform.startswith("win"), "skipped on Windows: " + justification)
+
 class TemporaryTestDirectory():
     def __init__(self):
         if no_clean: